Merge branch 'jenkinsci:main' into patch-1

jenkinsci · Dec 18, 2023 · fe57976 · fe57976
2 parents b4dd316 + ad3f1f7
commit fe57976
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -29,7 +29,7 @@ jobs:
           version: v3.12.0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11.4
 

diff --git a/.github/workflows/sync-lts.yaml b/.github/workflows/sync-lts.yaml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Jenkins LTS version
         id: lts
-        uses: jenkins-infra/jenkins-version@0.4.7
+        uses: jenkins-infra/jenkins-version@0.5.0
         with:
           version-identifier: lts
 

diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
@@ -12,6 +12,11 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 The changelog until v1.5.7 was auto-generated based on git commits.
 Those entries include a reference to the git commit to be able to get more details.
 
+## 4.9.2
+
+Update Jenkins image and appVersion to jenkins lts release version 2.426.2
+
+
 Notes about [Artifact Hub](https://artifacthub.io/packages/helm/jenkinsci/jenkins?modal=changelog) changelog processing:
 - Remove empty lines
 - Keep only ASCII characters (no emojis)

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: jenkins
 home: https://jenkins.io/
-version: 4.9.1
-appVersion: 2.426.1
+version: 4.9.2
+appVersion: 2.426.2
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides over 1800 plugins to support building, deploying and automating any project.
 sources:
   - https://github.com/jenkinsci/jenkins
@@ -35,7 +35,7 @@ annotations:
       url: https://github.com/jenkinsci/helm-charts/issues
   artifacthub.io/images: |
     - name: jenkins
-      image: jenkins/jenkins:2.426.1-jdk17
+      image: jenkins/jenkins:2.426.2-jdk17
     - name: k8s-sidecar
       image: kiwigrid/k8s-sidecar:1.24.4
     - name: inbound-agent

diff --git a/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml b/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
@@ -72,7 +72,7 @@ tests:
                         value: "50000"
                       - name: CASC_JENKINS_CONFIG
                         value: /var/jenkins_home/casc_configs
-                    image: jenkins/jenkins:2.426.1-jdk17
+                    image: jenkins/jenkins:2.426.2-jdk17
                     imagePullPolicy: Always
                     securityContext:
                       runAsUser: 1000
@@ -191,7 +191,7 @@ tests:
                     command:
                       - sh
                       - /var/jenkins_config/apply_config.sh
-                    image: jenkins/jenkins:2.426.1-jdk17
+                    image: jenkins/jenkins:2.426.2-jdk17
                     imagePullPolicy: Always
                     securityContext:
                       runAsUser: 1000
@@ -363,12 +363,12 @@ tests:
   - it: configure image tag
     template: jenkins-controller-statefulset.yaml
     set:
-      controller.tag: 2.426.1-slim
+      controller.tag: 2.426.2-slim
       controller.imagePullPolicy: IfNotPresent
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: jenkins/jenkins:2.426.1-slim
+          value: jenkins/jenkins:2.426.2-slim
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy
           value: IfNotPresent
@@ -379,15 +379,15 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: jenkins/jenkins:2.426.1-alpine
+          value: jenkins/jenkins:2.426.2-alpine
   - it: configure empty image tag label
     template: jenkins-controller-statefulset.yaml
     set:
       controller.tagLabel:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: jenkins/jenkins:2.426.1
+          value: jenkins/jenkins:2.426.2
   - it: custom image
     template: jenkins-controller-statefulset.yaml
     set:

diff --git a/charts/jenkins/values.yaml b/charts/jenkins/values.yaml
@@ -22,7 +22,7 @@ controller:
   # Used for label app.kubernetes.io/component
   componentName: "jenkins-controller"
   image: "jenkins/jenkins"
-  # tag: "2.426.1-jdk17"
+  # tag: "2.426.2-jdk17"
   tagLabel: jdk17
   imagePullPolicy: "Always"
   imagePullSecretName: