test cov: removed redundant jacoco download in dockerfile

Author: chubnastia

.gitlab-ci.yml

@@ -226,8 +226,11 @@ container:
   image: ghcr.io/kaniko-build/dist/chainguard-dev-kaniko/executor:latest-debug
   needs:
     - tar
+    - job: get_jacoco_cli
+      optional: true
   dependencies:
     - tar
+    - get_jacoco_cli
   script:
     - |-
       tag=$CI_COMMIT_SHORT_SHA
@@ -236,6 +239,7 @@ container:
         tag=$CI_COMMIT_TAG
         jacoco_enabled=false
       fi
+    - mkdir -p "jacoco-${JACOCO_VERSION}/lib"
     - mkdir maven
     - tar -C maven --strip-components=1 -xzvf packages/tar/target/dcache-*.tar.gz
     - cp $CI_PROJECT_DIR/packages/tar/src/main/container/* .

packages/tar/src/main/container/Dockerfile

@@ -7,16 +7,9 @@ FROM almalinux:10-minimal as builder
 RUN microdnf -y install java-21-openjdk-devel java-21-openjdk-jmods binutils
 RUN jlink --compress=zip-6 --strip-debug --no-header-files --no-man-pages --add-modules java.base,java.compiler,java.instrument,java.logging,java.management,java.naming,java.security.jgss,java.transaction.xa,java.xml,jdk.jfr,jdk.security.auth,jdk.unsupported,java.desktop,java.sql,jdk.naming.dns,java.rmi,jdk.crypto.cryptoki --output /jlink-runtime
 ARG JACOCO_VERSION
-ARG JACOCO_ENABLED=false
-RUN if [ "$JACOCO_ENABLED" = "true" ]; then \
-      microdnf -y install wget unzip && \
-      wget -q "https://github.com/jacoco/jacoco/releases/download/v${JACOCO_VERSION}/jacoco-${JACOCO_VERSION}.zip" \
-           -O /tmp/jacoco.zip && \
-      unzip -q /tmp/jacoco.zip -d /tmp/jacoco; \
-    else \
-      mkdir -p /tmp/jacoco/lib && \
-      touch /tmp/jacoco/lib/jacocoagent.jar /tmp/jacoco/lib/jacococli.jar; \
-    fi
+RUN mkdir -p /tmp/jacoco/lib
+COPY jacoco-${JACOCO_VERSION}/lib/jacocoagent.jar* /tmp/jacoco/lib/
+COPY jacoco-${JACOCO_VERSION}/lib/jacococli.jar* /tmp/jacoco/lib/
 
 # Minimalistic Java image
 FROM almalinux:10-minimal
@@ -27,8 +20,8 @@ ARG JACOCO_ENABLED=false
 ENV JACOCO_ENABLED=${JACOCO_ENABLED}
 # Copy both the agent and the cli
 ENV DCACHE_INSTALL_DIR=/opt/dcache
-COPY --from=builder /tmp/jacoco/lib/jacocoagent.jar ${DCACHE_INSTALL_DIR}/share/classes/jacocoagent.jar
-COPY --from=builder /tmp/jacoco/lib/jacococli.jar ${DCACHE_INSTALL_DIR}/share/classes/jacococli.jar
+COPY --from=builder /tmp/jacoco/lib/jacocoagent.jar* ${DCACHE_INSTALL_DIR}/share/classes/
+COPY --from=builder /tmp/jacoco/lib/jacococli.jar* ${DCACHE_INSTALL_DIR}/share/classes/
 
 # Neede by groupadd and useradd
 # REVISIT: in some environments base OS kernel doesnt allow use of xattrs and the installation of