Merge pull request 'chore(deps): update jenkins/inbound-agent:alpine-jdk21 docker digest to ce5fe24' (#10) from renovate/jenkins-inbound-agent-alpine-jdk21 into master

Reviewed-on: #10

Dockerfile

@@ -2,7 +2,7 @@
 # https://hub.docker.com/r/jenkins/inbound-agent/tags
 
 
-FROM jenkins/inbound-agent:alpine-jdk17@sha256:3452960784c5b0a32cdd7cab20d23341f8a480d6783f567d565f5c0c7aa0418a
+FROM jenkins/inbound-agent:alpine-jdk21@sha256:ce5fe247069abd73c82d40ae5c6c400ead2c12f7be854be368d64893afc2663a
 
 ARG BUILDUSER=jenkins
 
@@ -32,8 +32,8 @@ ADD entrypoint.sh /usr/local/bin/entrypoint.sh
 # conf/registries.conf will be mounted RO at runtime to inherit worker settings incl. caching proxies
 ADD --chown=$BUILDUSER:$BUILDUSER conf/containers.conf conf/storage.conf /home/$BUILDUSER/.config/containers
 
-RUN echo -e "$BUILDUSER:1:999\n$BUILDUSER:1001:64535" > /etc/subuid && \
+RUN echo -e "$BUILDUSER:100000:65535" > /etc/subuid && \
-    echo -e "$BUILDUSER:1:999\n$BUILDUSER:1001:64535" > /etc/subgid && \
+    echo -e "$BUILDUSER:100000:65535" > /etc/subgid && \
     cd /usr/bin && ln -s podman docker && \
     chown $BUILDUSER:$BUILDUSER -R /home/$BUILDUSER
 
@@ -41,9 +41,14 @@ RUN echo -e "$BUILDUSER:1:999\n$BUILDUSER:1001:64535" > /etc/subuid && \
 RUN sed -i -e 's/exec \$JAVA_BIN/podman system service -t0\&\n        exec \$JAVA_BIN/' /usr/local/bin/jenkins-agent
 
 ENV XDG_RUNTIME_DIR=/home/$BUILDUSER/agent/xdg-run
+ENV XDG_CONFIG_HOME=/home/$BUILDUSER/.config
+
 ENV BUILDAH_ISOLATION=chroot
 ENV _CONTAINERS_USERNS_CONFIGURED=""
-ENV HOME=/home/$BUILDUSER
+
+# Until we setup the logging and metrics pipelines in OTEL
+ENV OTEL_LOGS_EXPORTER=none
+ENV OTEL_METRICS_EXPORTER=none
 
 USER $BUILDUSER
 

Jenkinsfile

@@ -2,4 +2,4 @@ library identifier: 'zdt-lib@master', retriever: modernSCM(
   [$class: 'GitSCMSource',
    remote: 'https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git'])
 
-buildPodman name: 'jenkins-podman', trivyFail: 'NONE'
+buildPodman name: 'jenkins-podman'

entrypoint.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-mkdir -p $HOME/agent/xdg-run $HOME/agent/containers/run $HOME/agent/containers/storage
+mkdir -p $XDG_RUNTIME_DIR
 /usr/local/bin/jenkins-agent

junit.tpl

@@ -14,8 +14,12 @@
         </testcase>
     {{- end }}
     </testsuite>
-{{- $failures := len .Misconfigurations }}
+
-    <testsuite tests="{{ $failures }}" failures="{{ $failures }}" name="{{  .Target }}" errors="0" skipped="0" time="">
+{{- if .MisconfSummary }}
+    <testsuite tests="{{ add .MisconfSummary.Successes .MisconfSummary.Failures }}" failures="{{ .MisconfSummary.Failures }}" name="{{  .Target }}" errors="0" skipped="{{ .MisconfSummary.Exceptions }}" time="">
+{{- else }}
+    <testsuite tests="0" failures="0" name="{{  .Target }}" errors="0" skipped="0" time="">
+{{- end }}
     {{- if not (eq .Type "") }}
         <properties>
             <property name="type" value="{{ .Type }}"></property>
@@ -23,7 +27,9 @@
         {{- end -}}
         {{ range .Misconfigurations }}
         <testcase classname="{{ .Type }}" name="[{{ .Severity }}] {{ .ID }}" time="">
+        {{- if (eq .Status "FAIL") }}
             <failure message="{{ escapeXML .Title }}" type="description">{{ escapeXML .Description }}</failure>
+        {{- end }}
         </testcase>
     {{- end }}
     </testsuite>