From d0ffaf1d27ad0eee6981abb77b3b1c2ffa028bad Mon Sep 17 00:00:00 2001 From: Daniel Strebel Date: Wed, 18 Oct 2023 11:38:54 +0200 Subject: [PATCH 1/2] fix: failing nightly because of jenkins version incompatibility --- references/cicd-pipeline/jenkins-build/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/references/cicd-pipeline/jenkins-build/Dockerfile b/references/cicd-pipeline/jenkins-build/Dockerfile index 7a9d5f67d..e6b296e79 100644 --- a/references/cicd-pipeline/jenkins-build/Dockerfile +++ b/references/cicd-pipeline/jenkins-build/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. -FROM jenkins/jenkins:2.346.3-alpine +FROM jenkins/jenkins:2.346.3-lts-alpine USER root RUN apk update && apk add --no-cache git maven nodejs npm @@ -26,7 +26,7 @@ RUN mv /usr/bin/mvn /usr/bin/_mvn &&\ USER jenkins COPY --chown=jenkins plugins.txt /usr/share/jenkins/ref/plugins.txt -RUN jenkins-plugin-cli --plugin-file /usr/share/jenkins/ref/plugins.txt +RUN jenkins-plugin-cli --plugin-file /usr/share/jenkins/ref/plugins.txt --jenkins-version 2.346.3 --latest false COPY --chown=jenkins jenkins.yml /var/jenkins_home/casc_configs/jenkins.yaml ENV CASC_JENKINS_CONFIG=/var/jenkins_home/casc_configs/jenkins.yaml From adcbd195535026ee768757911a14939d86cbbcb6 Mon Sep 17 00:00:00 2001 From: Daniel Strebel Date: Wed, 18 Oct 2023 12:13:59 +0200 Subject: [PATCH 2/2] fix: fix javax-mail-api jenksin pugin version --- references/cicd-pipeline/jenkins-build/plugins.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/references/cicd-pipeline/jenkins-build/plugins.txt b/references/cicd-pipeline/jenkins-build/plugins.txt index 3d088e650..6280b28ac 100644 --- a/references/cicd-pipeline/jenkins-build/plugins.txt +++ b/references/cicd-pipeline/jenkins-build/plugins.txt @@ -2,6 +2,7 @@ configuration-as-code:1569.vb_72405b_80249 cucumber-reports:5.7.3 git:4.11.5 htmlpublisher:1.30 +javax-mail-api:1.6.2-8 junit:1119.1121.vc43d0fc45561 mask-passwords:3.3 token-macro:293.v283932a_0a_b_49