changed to 'set dcache.env.JACOCO_OPTS'

Author: chubnastia

.gitlab-ci.yml

@@ -566,8 +566,7 @@ Helm-Deploy Current dCache build:
       --set dcache.hsm.enabled=true 
       --set dcache.qos.enabled=true 
       --set image.registry=${CI_REGISTRY} 
-      --set dcache.layoutExtraPre="[defaults]
-      dcache.java.options.extra=-javaagent:/opt/dcache/share/classes/jacocoagent.jar=output=tcpserver\,address=127.0.0.1\,port=6300"
+      --set "dcache.env.JACOCO_OPTS=output=tcpserver\,address=127.0.0.1\,port=6300"
       --set "dcache.pools={a,b}" 
       --values .ci/custom-helm-config.yaml 
       store dcache/dcache
@@ -583,8 +582,7 @@ Helm-Deploy Latest dCache Golden Release:
     - >
       helm -n ${K8S_NAMESPACE} install ${HELM_OPTS} --wait 
       --set image.tag=${DCACHE_COMPATIBILITY_VERSION} 
-      --set dcache.layoutExtraPre="[defaults]
-      dcache.java.options.extra=-javaagent:/opt/dcache/share/classes/jacocoagent.jar=output=tcpserver\,address=127.0.0.1\,port=6300" 
+      --set "dcache.env.JACOCO_OPTS=output=tcpserver\,address=127.0.0.1\,port=6300"
       --set "dcache.pools={d,f}" 
       --set dcache.door.enabled=false 
       --set image.registry=${CI_REGISTRY} 

packages/tar/src/main/container/Dockerfile

@@ -61,7 +61,7 @@ COPY docker-layout.conf ${DCACHE_INSTALL_DIR}/etc/layouts/docker-layout.conf
 COPY exports ${DCACHE_INSTALL_DIR}/etc/exports
 # Download the JaCoCo agent runtime JAR so run.sh can find it
 RUN curl -s -L -o ${DCACHE_INSTALL_DIR}/share/classes/jacocoagent.jar \
-    https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar
+    https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.14/org.jacoco.agent-0.8.14-runtime.jar
 COPY run.sh /run.sh
 COPY s3-tape.yml /${DCACHE_INSTALL_DIR}/etc/s3-tape.yml