Merge branch 'weekly' into fixes

Author: gounthar

.env

@@ -1,3 +1,3 @@
 GHCR_USERNAME=jenkins-docs
 IMAGE_PREFIX=ghcr.io
-BRANCH_SUFFIX=
+BRANCH_SUFFIX=weekly

.github/dependabot.yml

@@ -62,4 +62,4 @@ updates:
     directory: "./dockerfiles/dotnet"
     schedule:
       interval: weekly
-    open-pull-requests-limit: 10  
+    open-pull-requests-limit: 10

.github/workflows/updatecli.yaml

@@ -37,7 +37,7 @@ jobs:
       # It uses the "apply" command of updatecli with the specified config and values files
       # The GitHub token is passed as an environment variable
       - name: Run Updatecli in Apply mode
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/weekly'
         run: updatecli apply --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml
         env:
           UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

dockerfiles/Dockerfile

@@ -1,9 +1,10 @@
 # This Dockerfile is used to create a Jenkins server with a specific version and pre-configured settings.
 
 # We start by defining an ARG for the Jenkins version. This allows us to easily change the version of Jenkins we want to use.
-ARG JENKINS_VERSION=2.492.3
+ARG JENKINS_VERSION=2.505-jdk21
+
 # We then use the official Jenkins image with the specified version as our base image.
-FROM jenkins/jenkins:"${JENKINS_VERSION}"-lts-jdk21
+FROM jenkins/jenkins:"${JENKINS_VERSION}"-jdk21
 
 # We switch to the root user to have the necessary permissions for the upcoming operations.
 USER root

dockerfiles/plugins.txt

@@ -1,7 +1,7 @@
 ant:513.vde9e7b_a_0da_0f
 antisamy-markup-formatter:173.v680e3a_b_69ff3
 apache-httpcomponents-client-4-api:4.5.14-269.vfa_2321039a_83
-bootstrap5-api:5.3.3-2
+bootstrap5-api:5.3.3-3
 bouncycastle-api:2.30.1.80-256.vf98926042a_9b_
 branch-api:2.1217.v43d8b_b_d8b_2c7
 build-timeout:1.38

updatecli/updatecli.d/jenkins-lts.yaml

@@ -0,0 +1,76 @@
+---
+# This YAML configuration defines a pipeline for automatically updating the Jenkins Weekly version
+# in a Dockerfile. It utilizes various components such as sources, conditions, targets, and actions
+# to achieve this automation.
+
+# Define the pipeline's name and the SCM (Source Control Management) configurations.
+name: Bump Jenkins' Weekly version in the controller Dockerfile
+
+scms:
+  default:
+    kind: github
+    spec:
+      user: "{{ .github.user }}" # GitHub user for authentication
+      email: "{{ .github.email }}" # Email associated with the GitHub user
+      owner: "{{ .github.owner }}" # Owner of the GitHub repository
+      repository: "{{ .github.repository }}" # Name of the GitHub repository
+      token: "{{ requiredEnv .github.token }}" # GitHub token for authentication
+      username: "{{ .github.username }}" # GitHub username
+      branch: "{{ .github.branch }}" # Branch to apply changes
+
+# Define the sources for the pipeline. These are the origins of data used in the pipeline.
+sources:
+  JenkinsLatestWeekly:
+    name: Get the latest Jenkins Weekly version
+    kind: jenkins
+    spec:
+        release: weekly # Specifies that the weekly release of Jenkins is to be fetched
+  JenkinsLatestWeeklyJDK17:
+    name: Get the latest Jenkins Weekly version with JDK 17
+    kind: jenkins
+    spec:
+        release: weekly # Specifies that the weekly release of Jenkins is to be fetched
+        jdk: 17 # Specifies JDK 17 for the Jenkins version
+    transformers:
+      - addsuffix: "-jdk17" # Adds a suffix to the version to denote JDK 17
+
+# Define conditions that must be met for the pipeline to proceed.
+conditions:
+  # Test that the latest Weekly Jenkins version exists
+  jenkinsWeekly:
+    kind: jenkins
+    sourceid: JenkinsLatestWeekly # Links this condition to the JenkinsLatestWeekly source
+    spec:
+      release: weekly
+  # Test that the docker image exists
+  dockerImage:
+    kind: dockerimage
+    sourceid: JenkinsLatestWeekly # Links this condition to the JenkinsLatestWeekly source
+    spec:
+      image: "jenkins/jenkins" # Specifies the Docker image to check
+    transformers:
+      - addsuffix: "-jdk17" # Adds a suffix to denote JDK 17
+
+# Define the targets for the pipeline. These are the end goals the pipeline aims to achieve.
+targets:
+  setJenkinsLatestWeekly:
+    kind: dockerfile
+    sourceid: JenkinsLatestWeeklyJDK17 # Links this target to the JenkinsLatestWeeklyJDK17 source
+    spec:
+      file: dockerfiles/Dockerfile # Specifies the Dockerfile to be updated
+      instruction:
+        keyword: "ARG" # Specifies the Dockerfile instruction to update
+        matcher: "JENKINS_VERSION" # Specifies the argument to be updated
+    name: "[jenkins-controller] Bump Jenkins Weekly version in dockerfiles/Dockerfile"
+    scmid: default # Links this target to the default SCM configuration
+
+# Define the actions to be taken once the conditions are met and targets are ready.
+actions:
+  default:
+    kind: github/pullrequest
+    scmid: default # Links this action to the default SCM configuration
+    title: Update Jenkins Weekly versions to {{ source "JenkinsLatestWeekly" }}-jdk17 in the controller Dockerfile
+    spec:
+      labels:
+        - dependencies # Label for the pull request
+        - chore # Label for the pull request

updatecli/updatecli.d/jenkins-weekly.yaml

@@ -3,6 +3,6 @@ github:
   email: "41898282+github-actions[bot]@users.noreply.github.com"
   username: "github-actions"
   token: "UPDATECLI_GITHUB_TOKEN"
-  branch: "main"
+  branch: "weekly"
   owner: "jenkins-docs"
   repository: "quickstart-tutorials"