From 1e1816017995527dbf4c7db96c0d5891e87e193d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 23:24:12 +0100 Subject: [PATCH] chore: update Jenkins lts version to 2.528.3 (#1147) Co-authored-by: brokenpip3 <40476330+brokenpip3@users.noreply.github.com> --- chart/jenkins-operator/values.yaml | 2 +- config.base.env | 2 +- pkg/constants/constants.go | 2 +- pkg/plugins/base_plugins.go | 4 ++-- test/bats/1-deploy.bats | 4 ++-- test/bats/2-deploy-with-more-options.bats | 4 ++-- test/bats/3-deploy-with-webhook.bats | 4 ++-- test/e2e/configuration_test.go | 4 ++-- test/e2e/test_utility.go | 2 +- test/helm/helm_test.go | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index a8bc864b..4c4e39bf 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -36,7 +36,7 @@ jenkins: # image is the name (and tag) of the Jenkins instance # Default: jenkins/jenkins:lts # It's recommended to use LTS (tag: "lts") version - image: jenkins/jenkins:2.528.2-lts + image: jenkins/jenkins:2.528.3-lts # env contains jenkins container environment variables env: [] diff --git a/config.base.env b/config.base.env index d9f2d74a..f36ffe0d 100644 --- a/config.base.env +++ b/config.base.env @@ -7,7 +7,7 @@ GO_VERSION="1.22" HELM_VERSION="3.12.3" IMAGE_PULL_MODE="local" KIND_CLUSTER_NAME="jenkins" -LATEST_LTS_VERSION="2.528.2" +LATEST_LTS_VERSION="2.528.3" NAME="kubernetes-operator" NAMESPACE="default" OPERATOR_SDK_VERSION="1.35.0" diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 2d83909f..776c43d5 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -8,7 +8,7 @@ const ( // SeedJobSuffix is a suffix added for all seed jobs SeedJobSuffix = "job-dsl-seed" // DefaultJenkinsMasterImage is the default Jenkins master docker image - DefaultJenkinsMasterImage = "jenkins/jenkins:2.528.2-lts" + DefaultJenkinsMasterImage = "jenkins/jenkins:2.528.3-lts" // DefaultHTTPPortInt32 is the default Jenkins HTTP port DefaultHTTPPortInt32 = int32(8080) // DefaultSlavePortInt32 is the default Jenkins port for slaves diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go index 82c9db65..89363586 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -2,9 +2,9 @@ package plugins const ( configurationAsCodePlugin = "configuration-as-code:2006.v001a_2ca_6b_574" - gitPlugin = "git:5.8.0" + gitPlugin = "git:5.8.1" jobDslPlugin = "job-dsl:1.93" - kubernetesPlugin = "kubernetes:4392.v19cea_fdb_5913" + kubernetesPlugin = "kubernetes:4398.vb_b_33d9e7fe23" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_" // Depends on workflow-job which should be automatically downloaded // Hardcoding the workflow-job version leads to frequent breakage diff --git a/test/bats/1-deploy.bats b/test/bats/1-deploy.bats index 4f7d58db..1cc06662 100644 --- a/test/bats/1-deploy.bats +++ b/test/bats/1-deploy.bats @@ -33,7 +33,7 @@ diag() { --set namespace=${DETIK_CLIENT_NAMESPACE} \ --set operator.image=${OPERATOR_IMAGE} \ --set jenkins.latestPlugins=true \ - --set jenkins.image="jenkins/jenkins:2.528.2-lts" \ + --set jenkins.image="jenkins/jenkins:2.528.3-lts" \ --set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ @@ -158,7 +158,7 @@ diag() { --set namespace=${DETIK_CLIENT_NAMESPACE} \ --set operator.image=${OPERATOR_IMAGE} \ --set jenkins.latestPlugins=true \ - --set jenkins.image="jenkins/jenkins:2.528.2-lts" \ + --set jenkins.image="jenkins/jenkins:2.528.3-lts" \ --set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ diff --git a/test/bats/2-deploy-with-more-options.bats b/test/bats/2-deploy-with-more-options.bats index 52540baa..9833c9cd 100644 --- a/test/bats/2-deploy-with-more-options.bats +++ b/test/bats/2-deploy-with-more-options.bats @@ -29,7 +29,7 @@ setup() { --set operator.image=${OPERATOR_IMAGE} \ --set jenkins.latestPlugins=true \ --set jenkins.nodeSelector.batstest=yep \ - --set jenkins.image="jenkins/jenkins:2.528.2-lts" \ + --set jenkins.image="jenkins/jenkins:2.528.3-lts" \ --set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.backup.makeBackupBeforePodDeletion=false \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ @@ -107,7 +107,7 @@ setup() { --set operator.image=${OPERATOR_IMAGE} \ --set jenkins.latestPlugins=true \ --set jenkins.nodeSelector.batstest=yep \ - --set jenkins.image="jenkins/jenkins:2.528.2-lts" \ + --set jenkins.image="jenkins/jenkins:2.528.3-lts" \ --set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \ --set jenkins.backup.makeBackupBeforePodDeletion=false \ diff --git a/test/bats/3-deploy-with-webhook.bats b/test/bats/3-deploy-with-webhook.bats index 5ed3e2ef..c8cd352c 100644 --- a/test/bats/3-deploy-with-webhook.bats +++ b/test/bats/3-deploy-with-webhook.bats @@ -29,7 +29,7 @@ setup() { --set namespace=${DETIK_CLIENT_NAMESPACE} \ --set operator.image=${OPERATOR_IMAGE} \ --set jenkins.latestPlugins=true \ - --set jenkins.image="jenkins/jenkins:2.528.2-lts" \ + --set jenkins.image="jenkins/jenkins:2.528.3-lts" \ --set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.backup.makeBackupBeforePodDeletion=true \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ @@ -90,7 +90,7 @@ setup() { --set namespace=${DETIK_CLIENT_NAMESPACE} \ --set operator.image=${OPERATOR_IMAGE} \ --set jenkins.latestPlugins=true \ - --set jenkins.image="jenkins/jenkins:2.528.2-lts" \ + --set jenkins.image="jenkins/jenkins:2.528.3-lts" \ --set jenkins.imagePullPolicy="IfNotPresent" \ --set jenkins.backup.makeBackupBeforePodDeletion=true \ --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index db0c79d1..680fd299 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -27,9 +27,9 @@ const e2e = "e2e" // github.com/jenkinsci/kubernetes-operator/pkg/plugins/base_plugins.go const ( configurationAsCodePlugin = "configuration-as-code:2006.v001a_2ca_6b_574" - gitPlugin = "git:5.8.0" + gitPlugin = "git:5.8.1" jobDslPlugin = "job-dsl:1.93" - kubernetesPlugin = "kubernetes:4392.v19cea_fdb_5913" + kubernetesPlugin = "kubernetes:4398.vb_b_33d9e7fe23" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_" // Depends on workflow-job which should be automatically downloaded // Hardcoding the workflow-job version leads to frequent breakage diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index a22e3e4e..12cc6c2b 100644 --- a/test/e2e/test_utility.go +++ b/test/e2e/test_utility.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" ) -const JenkinsTestImage = "jenkins/jenkins:2.528.2-lts" +const JenkinsTestImage = "jenkins/jenkins:2.528.3-lts" var ( Cfg *rest.Config diff --git a/test/helm/helm_test.go b/test/helm/helm_test.go index 672fa120..473bb512 100644 --- a/test/helm/helm_test.go +++ b/test/helm/helm_test.go @@ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() { cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug", "--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name), - "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.528.2-lts"), + "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.528.3-lts"), "--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"), "--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install")