chore: update Jenkins lts version to 2.528.1 (#1137)
Co-authored-by: brokenpip3 <40476330+brokenpip3@users.noreply.github.com>
This commit is contained in:
parent
bf040e1188
commit
08f0a74771
|
|
@ -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.516.3-lts
|
||||
image: jenkins/jenkins:2.528.1-lts
|
||||
|
||||
# env contains jenkins container environment variables
|
||||
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.516.3"
|
||||
LATEST_LTS_VERSION="2.528.1"
|
||||
NAME="kubernetes-operator"
|
||||
NAMESPACE="default"
|
||||
OPERATOR_SDK_VERSION="1.35.0"
|
||||
|
|
|
|||
|
|
@ -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.516.3-lts"
|
||||
DefaultJenkinsMasterImage = "jenkins/jenkins:2.528.1-lts"
|
||||
// DefaultHTTPPortInt32 is the default Jenkins HTTP port
|
||||
DefaultHTTPPortInt32 = int32(8080)
|
||||
// DefaultSlavePortInt32 is the default Jenkins port for slaves
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package plugins
|
||||
|
||||
const (
|
||||
configurationAsCodePlugin = "configuration-as-code:1998.v3e50e6e9d9d3"
|
||||
gitPlugin = "git:5.7.0"
|
||||
configurationAsCodePlugin = "configuration-as-code:2006.v001a_2ca_6b_574"
|
||||
gitPlugin = "git:5.8.0"
|
||||
jobDslPlugin = "job-dsl:1.93"
|
||||
kubernetesPlugin = "kubernetes:4384.v1b_6367f393d9"
|
||||
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_"
|
||||
|
|
|
|||
|
|
@ -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.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-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.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=false \
|
||||
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
|
||||
|
|
|
|||
|
|
@ -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.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-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.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=false \
|
||||
|
|
|
|||
|
|
@ -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.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-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.516.3-lts" \
|
||||
--set jenkins.image="jenkins/jenkins:2.528.1-lts" \
|
||||
--set jenkins.imagePullPolicy="IfNotPresent" \
|
||||
--set jenkins.backup.makeBackupBeforePodDeletion=true \
|
||||
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ 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:1998.v3e50e6e9d9d3"
|
||||
gitPlugin = "git:5.7.0"
|
||||
configurationAsCodePlugin = "configuration-as-code:2006.v001a_2ca_6b_574"
|
||||
gitPlugin = "git:5.8.0"
|
||||
jobDslPlugin = "job-dsl:1.93"
|
||||
kubernetesPlugin = "kubernetes:4384.v1b_6367f393d9"
|
||||
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.299.v610fa_e76761a_"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import (
|
|||
"sigs.k8s.io/controller-runtime/pkg/envtest"
|
||||
)
|
||||
|
||||
const JenkinsTestImage = "jenkins/jenkins:2.516.3-lts"
|
||||
const JenkinsTestImage = "jenkins/jenkins:2.528.1-lts"
|
||||
|
||||
var (
|
||||
Cfg *rest.Config
|
||||
|
|
|
|||
|
|
@ -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.516.3-lts"),
|
||||
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.528.1-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")
|
||||
|
|
|
|||
Loading…
Reference in New Issue