Merge branch 'weekly' into weekly-with-plugins

Author: MarkEWaite

.ci/publish.sh

@@ -11,6 +11,7 @@ set -eu -o pipefail
 
 : "${DOCKERHUB_ORGANISATION:=jenkins}"
 : "${DOCKERHUB_REPO:=jenkins}"
+: "${BAKE_TARGET:=linux}"
 
 export JENKINS_REPO="${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}"
 
@@ -76,15 +77,22 @@ else
 fi
 
 build_opts=("--pull")
+metadata_suffix="publish"
 if test "${dry_run}" == "true"; then
-    build_opts+=("--load")
+    build_opts+=("--set=*.output=type=cacheonly")
+    metadata_suffix="dry-run"
 else
     build_opts+=("--push")
 fi
 
+# Save build result metadata
+mkdir -p target
+BUILD_METADATA_PATH="target/build-result-metadata_${BAKE_TARGET}_${metadata_suffix}.json"
+build_opts+=("--metadata-file=${BUILD_METADATA_PATH}")
+
 WAR_SHA="$(curl --disable --fail --silent --show-error --location "https://repo.jenkins-ci.org/releases/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war.sha256")"
 COMMIT_SHA=$(git rev-parse HEAD)
-export COMMIT_SHA JENKINS_VERSION WAR_SHA LATEST_WEEKLY LATEST_LTS
+export COMMIT_SHA JENKINS_VERSION WAR_SHA LATEST_WEEKLY LATEST_LTS BUILD_METADATA_PATH
 
 cat <<EOF
 Using the following settings:
@@ -94,6 +102,13 @@ Using the following settings:
 * COMMIT_SHA: ${COMMIT_SHA}
 * LATEST_WEEKLY: ${LATEST_WEEKLY}
 * LATEST_LTS: ${LATEST_LTS}
+* BUILD_METADATA_PATH: ${BUILD_METADATA_PATH}
+* BAKE_TARGET: ${BAKE_TARGET}
+* BAKE OPTIONS:
+$(printf '  %s\n' "${build_opts[@]}")
+
+* RESOLVED BAKE CONFIG:
+$(docker buildx bake --file docker-bake.hcl --print "${BAKE_TARGET}")
 EOF
 
-docker buildx bake --file docker-bake.hcl "${build_opts[@]}" linux
+docker buildx bake --file docker-bake.hcl "${build_opts[@]}" "${BAKE_TARGET}"

.github/dependabot.yml

@@ -18,18 +18,6 @@ updates:
 
 # Debian Linux
 
-- package-ecosystem: docker
-  directory: "debian"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 2
-  target-branch: master
-  labels:
-  - dependencies
-  ignore:
-  # Ignore proposals to update to new versions of Java because updatecli takes care of that.
-  - dependency-name: "eclipse-temurin"
-
 - package-ecosystem: docker
   directory: "debian"
   schedule:

.github/workflows/updatecli.yaml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.98.0
+        uses: updatecli/updatecli-action@v2.99.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml

.gitignore

@@ -17,6 +17,8 @@ work-pester-jenkins-windows/
 /**/windows/**/jenkins-plugin-cli.ps1
 /**/windows/**/jenkins-support.psm1
 
+build-windows_*.yaml
+
 tests/**/Dockerfile\.*
 
 /__pycache__/

HACKING.adoc

@@ -149,17 +149,116 @@ In order to debug the controller, use the `-e DEBUG=true -p 5005:5005` when star
 Jenkins will be suspended on the startup in such case,
 and then it will be possible to attach a debugger from IDE to it.
 
-== Test the publishing using an overridden target repository on Docker Hub
+== Test images publication
 
-Create a new dedicated target repository in your Docker Hub account, and use it like follows:
+You can test the script used for publication in dry-run by setting an existing Jenkins Core version and by passing the `-n` option:
 
 [source,bash]
 --
-export DOCKERHUB_ORGANISATION=batmat
-export DOCKERHUB_REPO=test-jenkins
+$ export JENKINS_VERSION=2.528.3
+$ ./.ci/publish.sh -n
+Dry run, will not publish images
+Using the following settings:
+* JENKINS_REPO: jenkins/jenkins
+* JENKINS_VERSION: 2.528.3
+* WAR_SHA: bfa31f1e3aacebb5bce3d5076c73df97bf0c0567eeb8d8738f54f6bac48abd74
+* COMMIT_SHA: 1c72a9383191562eb3c44838aeeadad0839c2c92
+* LATEST_WEEKLY: false
+* LATEST_LTS: true
+* BUILD_METADATA_PATH: target/build-result-metadata_linux_dry-run.json
+[+] Building 104.6s (59/73)
+<...snip...>
+--
+
+Note that if you can set `BAKE_TARGET` to test the publication of a single target instead the default "linux" multiarch (heavy) build:
+
+[source,bash]
+--
+$ export BAKE_TARGET=debiand_jdk25
+$ ./.ci/publish.sh -n
+Using the following settings:
+* JENKINS_REPO: jenkins/jenkins
+* JENKINS_VERSION: 2.528.3
+* WAR_SHA: bfa31f1e3aacebb5bce3d5076c73df97bf0c0567eeb8d8738f54f6bac48abd74
+* COMMIT_SHA: aaf4e7faf887b7ac4879c3bf540ede48220cca9f
+* LATEST_WEEKLY: false
+* LATEST_LTS: true
+* BUILD_METADATA_PATH: target/build-result-metadata_debian_jdk25_dry-run.json
+* BAKE TARGET: debian_jdk25
+* BUILDX OPTIONS:
+  --pull
+  --set=*.output=type=cacheonly
+  --metadata-file=target/build-result-metadata_debian_jdk25_dry-run.json
+
+* RESOLVED BAKE CONFIG:
+{
+  "group": {
+    "default": {
+      "targets": [
+        "debian_jdk25"
+      ]
+    }
+  },
+  "target": {
+    "debian_jdk25": {
+      "context": ".",
+      "dockerfile": "debian/Dockerfile",
+      "args": {
+        "COMMIT_SHA": "aaf4e7faf887b7ac4879c3bf540ede48220cca9f",
+        "DEBIAN_RELEASE_LINE": "trixie",
+        "DEBIAN_VARIANT": "",
+        "DEBIAN_VERSION": "20251117",
+        "JAVA_VERSION": "25.0.1_8",
+        "JENKINS_VERSION": "2.528.3",
+        "PLUGIN_CLI_VERSION": "2.13.2",
+        "WAR_SHA": "bfa31f1e3aacebb5bce3d5076c73df97bf0c0567eeb8d8738f54f6bac48abd74",
+        "WAR_URL": "https://get.jenkins.io/war-stable/2.528.3/jenkins.war"
+      },
+      "tags": [
+        "docker.io/jenkins/jenkins:2.528.3-jdk25",
+        "docker.io/jenkins/jenkins:lts-jdk25",
+        "docker.io/jenkins/jenkins:2.528.3-lts-jdk25"
+      ],
+      "platforms": [
+        "linux/amd64",
+        "linux/arm64",
+        "linux/s390x",
+        "linux/ppc64le"
+      ]
+    }
+  }
+}
+[+] Building 104.6s (59/73)
+...
+--
+
+You can also pass the `-d` option (debug) to see traces from the script.
+
+=== Using an overridden target repository on Docker Hub
+
+Create a new dedicated target repository in your Docker Hub account, and use it like follows (note the absence of `-d` option):
+
+[source,bash]
+--
+$ export DOCKERHUB_ORGANISATION=jenkins4eval
+$ export DOCKERHUB_REPO=test-jenkins
 # The log below will help confirm this override was taken in account:
-./publish.sh
-Docker repository in Use:
-* JENKINS_REPO: batmat/test-jenkins
+$ ./.ci/publish.sh
+Using the following settings:
+* JENKINS_REPO: jenkins4eval/test-jenkins
+* JENKINS_VERSION: 2.528.3
+* WAR_SHA: bfa31f1e3aacebb5bce3d5076c73df97bf0c0567eeb8d8738f54f6bac48abd74
+* COMMIT_SHA: aaf4e7faf887b7ac4879c3bf540ede48220cca9f
+* LATEST_WEEKLY: false
+* LATEST_LTS: true
+* BUILD_METADATA_PATH: target/build-result-metadata_linux_publish.json
+* BAKE TARGET: linux
+* BUILDX OPTIONS:
+  --pull
+  --push
+  --metadata-file=target/build-result-metadata_linux_publish.json
+
+* RESOLVED BAKE CONFIG:
+{
 ...
 --

Jenkinsfile

@@ -47,11 +47,16 @@ stage('Build') {
     withEnv(envVars) {
         echo '= bake target: linux'
 
-        def windowsImageTypes = ['windowsservercore-ltsc2022']
+        def windowsImageTypes = [
+            'windowsservercore-ltsc2019',
+            'windowsservercore-ltsc2022'
+        ]
         for (anImageType in windowsImageTypes) {
             def imageType = anImageType
             builds[imageType] = {
-                nodeWithTimeout('windows-2022') {
+                def windowsVersionNumber = imageType.split('-')[1].replace('ltsc', '')
+                def windowsLabel = "windows-${windowsVersionNumber}"
+                nodeWithTimeout(windowsLabel) {
                     stage('Checkout') {
                         checkout scm
                     }
@@ -63,13 +68,14 @@ stage('Build') {
                             */
                             stage("Build ${imageType}") {
                                 infra.withDockerCredentials {
-                                    powershell './make.ps1 build'
+                                    powershell './make.ps1 build -ImageType ${env:IMAGE_TYPE}'
+                                    archiveArtifacts artifacts: 'build-windows_*.yaml', allowEmptyArchive: true
                                 }
                             }
 
                             stage("Test ${imageType}") {
                                 infra.withDockerCredentials {
-                                    def windowsTestStatus = powershell(script: './make.ps1 test', returnStatus: true)
+                                    def windowsTestStatus = powershell(script: './make.ps1 test -ImageType ${env:IMAGE_TYPE}', returnStatus: true)
                                     junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'target/**/junit-results.xml')
                                     if (windowsTestStatus > 0) {
                                         // If something bad happened let's clean up the docker images
@@ -102,8 +108,8 @@ stage('Build') {
                                     stage('Publish') {
                                         infra.withDockerCredentials {
                                             withEnv(['DOCKERHUB_ORGANISATION=jenkins', 'DOCKERHUB_REPO=jenkins']) {
-                                                powershell './make.ps1 build'
-                                                powershell './make.ps1 publish'
+                                                powershell './make.ps1 build -ImageType ${env:IMAGE_TYPE}'
+                                                powershell './make.ps1 publish -ImageType ${env:IMAGE_TYPE}'
                                             }
                                         }
                                     }
@@ -116,8 +122,7 @@ stage('Build') {
         }
 
         if (!infra.isTrusted()) {
-            // This list can be updated with the following command:
-            // make show | jq -r '.target | keys[]' | sort
+            // An up to date list can be obtained with make list-linux
             def images = [
                 'alpine_jdk21',
                 'alpine_jdk25',
@@ -149,6 +154,7 @@ stage('Build') {
                         stage("Build linux-${imageToBuild}") {
                             infra.withDockerCredentials {
                                 sh "make build-${imageToBuild}"
+                                archiveArtifacts artifacts: 'target/build-result-metadata_*.json', allowEmptyArchive: true
                             }
                         }
 
@@ -178,7 +184,8 @@ stage('Build') {
                         // sanity check that proves all images build on declared platforms not already built in other stages
                         stage("Multi arch build - ${architecture}") {
                             infra.withDockerCredentials {
-                                sh "make docker-init listarch-${architecture} buildarch-${architecture}"
+                                sh "make docker-init buildarch-${architecture}"
+                                archiveArtifacts artifacts: 'target/build-result-metadata_*.json', allowEmptyArchive: true
                             }
                         }
                     }
@@ -206,6 +213,7 @@ stage('Build') {
                                     infra.withDockerCredentials {
                                         sh 'make docker-init'
                                         sh 'make publish'
+                                        archiveArtifacts artifacts: 'target/build-result-metadata_*.json', allowEmptyArchive: true
                                     }
                                 }
                             }