diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index 47453c67..05ac5610 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.492.3-lts + image: jenkins/jenkins:2.516.3-lts # env contains jenkins container environment variables env: [] diff --git a/config.base.env b/config.base.env index 508d3890..0bbc63ea 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.492.3" +LATEST_LTS_VERSION="2.516.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 00e37d7c..ad2faaf0 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.492.3-lts" + DefaultJenkinsMasterImage = "jenkins/jenkins:2.516.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 ecc42309..9f652b01 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -1,14 +1,14 @@ package plugins const ( - configurationAsCodePlugin = "configuration-as-code:1932.v75cb_b_f1b_698d" + configurationAsCodePlugin = "configuration-as-code:1998.v3e50e6e9d9d3" gitPlugin = "git:5.7.0" - jobDslPlugin = "job-dsl:1.89" - kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95" - kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5" + jobDslPlugin = "job-dsl:1.93" + kubernetesPlugin = "kubernetes:4384.v1b_6367f393d9" + 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 - workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" + workflowAggregatorPlugin = "workflow-aggregator:608.v67378e9d3db_1" ) // basePluginsList contains plugins to install by operator. diff --git a/test/bats/1-deploy.bats b/test/bats/1-deploy.bats index 2b1cfd80..4cece39b 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.492.3-lts" \ + --set jenkins.image="jenkins/jenkins:2.516.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.492.3-lts" \ + --set jenkins.image="jenkins/jenkins:2.516.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 38e00926..aa7b52e8 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.492.3-lts" \ + --set jenkins.image="jenkins/jenkins:2.516.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.492.3-lts" \ + --set jenkins.image="jenkins/jenkins:2.516.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 271033d1..e551e79f 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.492.3-lts" \ + --set jenkins.image="jenkins/jenkins:2.516.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.492.3-lts" \ + --set jenkins.image="jenkins/jenkins:2.516.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 14fb8b32..93332d75 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -26,14 +26,14 @@ const e2e = "e2e" // Plugin versions should be the same as in // github.com/jenkinsci/kubernetes-operator/pkg/plugins/base_plugins.go const ( - configurationAsCodePlugin = "configuration-as-code:1932.v75cb_b_f1b_698d" + configurationAsCodePlugin = "configuration-as-code:1998.v3e50e6e9d9d3" gitPlugin = "git:5.7.0" - jobDslPlugin = "job-dsl:1.89" - kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95" - kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5" + jobDslPlugin = "job-dsl:1.93" + kubernetesPlugin = "kubernetes:4384.v1b_6367f393d9" + 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 - workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" + workflowAggregatorPlugin = "workflow-aggregator:608.v67378e9d3db_1" ) var expectedBasePluginsList = []plugins.Plugin{ diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index 19aadf14..4f131356 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.492.3-lts" +const JenkinsTestImage = "jenkins/jenkins:2.516.3-lts" var ( Cfg *rest.Config diff --git a/test/helm/helm_test.go b/test/helm/helm_test.go index 97eb81e6..54cccdb8 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.492.3-lts"), + "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.516.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")