test cov: still trying to remove download in dockerfile

Author: chubnastia

.gitlab-ci.yml

@@ -42,6 +42,7 @@ stages:
   # clean k8s namespace, collect logs
   - testenv_post
   # on release, upload rpm, deb, tar, container
+  - upload
 
 variables:
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -Dmaven.repo.local=.m2/repository"
@@ -74,7 +75,7 @@ default:
       - runner_system_failure
       - api_failure
 #
-# default tags and image for testing stages/kubernetes/helm 
+# default tags and image for testing stages/kubernetes/helm
 #
 .kubernetes_tags:
   tags:
@@ -225,11 +226,8 @@ 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
@@ -238,7 +236,6 @@ 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/* .
@@ -319,10 +316,121 @@ RPM test install on EL9:
 #    - apt-get update
 #    - DEBIAN_FRONTEND=noninteractive apt install -y -f ./packages/fhs/target/dcache_*.deb
 
+upload_rpm:
+  stage: upload
+  image: almalinux:10-minimal
+  dependencies:
+    - sign_rpm
+  extends: .upload_rules
+  script:
+    - RPM_NAME=`ls packages/fhs/target/rpmbuild/RPMS/noarch/ | grep dcache`
+    - VERSION=`echo $RPM_NAME | cut -d'-' -f 2 | cut -d'.' -f 1,2`
+    - curl $PKG_UPLOAD_OPTIONS -u $PKG_UPLOAD_USER:$PKG_UPLOAD_PASS --upload-file packages/fhs/target/rpmbuild/RPMS/noarch/$RPM_NAME "$PKG_UPLOAD_URL/$VERSION/$RPM_NAME"
+
+upload_deb:
+  stage: upload
+  image: almalinux:10-minimal
+  dependencies:
+    - sign_deb
+  extends: .upload_rules
+  script:
+    - DEB_NAME=`ls packages/fhs/target/ | grep dcache`
+    - VERSION=`echo $DEB_NAME | cut -d'_' -f 2 | cut -d'.' -f 1,2`
+    - curl $PKG_UPLOAD_OPTIONS -u $PKG_UPLOAD_USER:$PKG_UPLOAD_PASS --upload-file packages/fhs/target/$DEB_NAME "$PKG_UPLOAD_URL/$VERSION/$DEB_NAME"
+
+upload_tar:
+  stage: upload
+  image: almalinux:10-minimal
+  dependencies:
+    - tar
+  extends: .upload_rules
+  script:
+    - TAR_NAME=`ls packages/tar/target/ | grep dcache`
+    - VERSION=`echo $TAR_NAME | cut -d'-' -f 2 | cut -d'.' -f 1,2`
+    - curl $PKG_UPLOAD_OPTIONS -u $PKG_UPLOAD_USER:$PKG_UPLOAD_PASS --upload-file packages/tar/target/$TAR_NAME "$PKG_UPLOAD_URL/$VERSION/$TAR_NAME"
+
+
+upload_container:
+  stage: upload
+  # Cache downloaded dependencies and plugins between builds.
+  # To keep cache across branches add 'key: "$CI_JOB_NAME"'
+  # For latest releases see https://github.com/GoogleContainerTools/kaniko/releases
+  # Only debug/*-debug versions of the Kaniko image are known to work within Gitlab CI
+  image: ghcr.io/kaniko-build/dist/chainguard-dev-kaniko/executor:latest-debug
+  dependencies:
+    - tar
+  extends: .upload_rules
+  script:
+    - |-
+      tag=$CI_COMMIT_TAG
+      branch_latest=`echo $CI_COMMIT_TAG | cut -d '.' -f 1,2`
+
+    - mkdir maven
+    - tar -C maven --strip-components=1 -xzvf packages/tar/target/dcache-*.tar.gz
+    - cp $CI_PROJECT_DIR/packages/tar/src/main/container/* .
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"$DOCKER_HUB_USER\",\"password\":\"$DOCKER_HUB_ACCESS_KEY\"}}}" > /kaniko/.docker/config.json
+    - >
+      /kaniko/executor
+      --label dcache.build=GA
+      --context $CI_PROJECT_DIR
+      --dockerfile $CI_PROJECT_DIR/Dockerfile
+      --destination dcache/dcache:$tag --destination dcache/dcache:$branch_latest
+
+#
 # This jobs needs that the number of changes to fetch from GitLab when cloning a repository is high enough to generate
 # the changelog.
+AI Generated Release Notes:
+  image: almalinux:10-minimal
+  stage: upload
+  extends: .upload_rules
+  allow_failure: true
+  dependencies:
+    - sign_deb
+    - sign_rpm
+    - tar
+  script:
+    - microdnf install -y git-core
+    - git fetch --refetch --all --tags
+    - .ci/generate-changelog.sh >> release-$CI_COMMIT_TAG.md
+    - curl -L -o chatgpt https://github.com/kardolus/chatgpt-cli/releases/latest/download/chatgpt-linux-amd64 && chmod +x chatgpt
+    - LAST_TAG=$(.ci/get-git-version.sh $CI_COMMIT_TAG)
+    - |-
+      git log --grep=maven-release-plugin --invert-grep $LAST_TAG..$CI_COMMIT_TAG | \
+        OPENAI_API_KEY=$LLM_API_KEY \
+        OPENAI_URL=$LLM_API_ENDPOINT \
+        OPENAI_MODEL=$LLM_MODEL \
+        OPENAI_COMPLETIONS_PATH=$LLM_COMPLETIONS_PATH \
+        OPENAI_ROLE="You are a helpful tech writer working on release notes of the dCache project, ignoring commits with messages starting with '[maven-release-plugin]'." \
+        ./chatgpt "$LLM_PROMPT" | \
+        tee -a release-$CI_COMMIT_TAG.md
+  artifacts:
+    paths:
+      - release-*.md
 
 
+#
+# Prepare releases download table in html format
+#
+Release Notes Table:
+  image: almalinux:10-minimal
+  stage: upload
+  extends: .upload_rules
+  allow_failure: true
+  dependencies:
+    - sign_deb
+    - sign_rpm
+    - tar
+  script:
+    - microdnf install -y git-core
+    - git fetch --refetch --all --tags
+    - .ci/generate-releases-xml.sh >> release-$CI_COMMIT_TAG.xml
+
+    #tee -a release-$CI_COMMIT_TAG.md
+  artifacts:
+    paths:
+      - release1-*.md
+
 #
 # prepare kubernetes env for the build
 #

packages/tar/src/main/container/Dockerfile

@@ -8,15 +8,11 @@ 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/
+RUN ls /tmp/jacoco/lib/jacocoagent.jar 2>/dev/null || touch /tmp/jacoco/lib/jacocoagent.jar
+RUN ls /tmp/jacoco/lib/jacococli.jar   2>/dev/null || touch /tmp/jacoco/lib/jacococli.jar
 
 # Minimalistic Java image
 FROM almalinux:10-minimal