chore: update to jenkins 2.440.1-lts
This commit is contained in:
parent
76d27c6012
commit
ca46f35b5f
|
|
@ -52,7 +52,7 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes
|
||||||
| jenkins.enabled | bool | `true` | |
|
| jenkins.enabled | bool | `true` | |
|
||||||
| jenkins.env | list | `[]` | |
|
| jenkins.env | list | `[]` | |
|
||||||
| jenkins.hostAliases | object | `{}` | |
|
| jenkins.hostAliases | object | `{}` | |
|
||||||
| jenkins.image | string | `"jenkins/jenkins:2.426.3-lts"` | |
|
| jenkins.image | string | `"jenkins/jenkins:2.440.1-lts"` | |
|
||||||
| jenkins.imagePullPolicy | string | `"Always"` | |
|
| jenkins.imagePullPolicy | string | `"Always"` | |
|
||||||
| jenkins.imagePullSecrets | list | `[]` | |
|
| jenkins.imagePullSecrets | list | `[]` | |
|
||||||
| jenkins.labels | object | `{}` | |
|
| jenkins.labels | object | `{}` | |
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ jenkins:
|
||||||
# image is the name (and tag) of the Jenkins instance
|
# image is the name (and tag) of the Jenkins instance
|
||||||
# Default: jenkins/jenkins:lts
|
# Default: jenkins/jenkins:lts
|
||||||
# It's recommended to use LTS (tag: "lts") version
|
# It's recommended to use LTS (tag: "lts") version
|
||||||
image: jenkins/jenkins:2.426.3-lts
|
image: jenkins/jenkins:2.440.1-lts
|
||||||
|
|
||||||
# env contains jenkins container environment variables
|
# env contains jenkins container environment variables
|
||||||
env: []
|
env: []
|
||||||
|
|
|
||||||
|
|
@ -12,5 +12,5 @@ GEN_CRD_API="gen-crd-api-reference-docs"
|
||||||
IMAGE_PULL_MODE="local"
|
IMAGE_PULL_MODE="local"
|
||||||
HELM_VERSION="3.12.3"
|
HELM_VERSION="3.12.3"
|
||||||
CLUSTER_DOMAIN="cluster.local"
|
CLUSTER_DOMAIN="cluster.local"
|
||||||
LATEST_LTS_VERSION="2.426.3"
|
LATEST_LTS_VERSION="2.440.1"
|
||||||
KIND_CLUSTER_NAME="jenkins"
|
KIND_CLUSTER_NAME="jenkins"
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ const (
|
||||||
// SeedJobSuffix is a suffix added for all seed jobs
|
// SeedJobSuffix is a suffix added for all seed jobs
|
||||||
SeedJobSuffix = "job-dsl-seed"
|
SeedJobSuffix = "job-dsl-seed"
|
||||||
// DefaultJenkinsMasterImage is the default Jenkins master docker image
|
// DefaultJenkinsMasterImage is the default Jenkins master docker image
|
||||||
DefaultJenkinsMasterImage = "jenkins/jenkins:2.426.3-lts"
|
DefaultJenkinsMasterImage = "jenkins/jenkins:2.440.1-lts"
|
||||||
// DefaultHTTPPortInt32 is the default Jenkins HTTP port
|
// DefaultHTTPPortInt32 is the default Jenkins HTTP port
|
||||||
DefaultHTTPPortInt32 = int32(8080)
|
DefaultHTTPPortInt32 = int32(8080)
|
||||||
// DefaultSlavePortInt32 is the default Jenkins port for slaves
|
// DefaultSlavePortInt32 is the default Jenkins port for slaves
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"sigs.k8s.io/controller-runtime/pkg/envtest"
|
"sigs.k8s.io/controller-runtime/pkg/envtest"
|
||||||
)
|
)
|
||||||
|
|
||||||
const JenkinsTestImage = "jenkins/jenkins:2.426.3-lts"
|
const JenkinsTestImage = "jenkins/jenkins:2.440.1-lts"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
Cfg *rest.Config
|
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",
|
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.namespace=%s", namespace.Name),
|
||||||
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.426.3-lts"),
|
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.440.1-lts"),
|
||||||
"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install")
|
"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install")
|
||||||
output, err := cmd.CombinedOutput()
|
output, err := cmd.CombinedOutput()
|
||||||
Expect(err).NotTo(HaveOccurred(), string(output))
|
Expect(err).NotTo(HaveOccurred(), string(output))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue