chore(pipeline/multiarch): don't rebuild images of architectures already built elsewhere (#2155)

Author: lemeurherve

Jenkinsfile

@@ -14,6 +14,15 @@ properties(listOfProperties)
 // Default environment variable set to allow images publication
 def envVars = ['PUBLISH=true']
 
+// List of architectures and corresponding ci.jenkins.io agent labels
+def architecturesAndCiJioAgentLabels = [
+    'amd64': 'docker && amd64',
+    'arm64': 'arm64docker',
+    // No corresponding agent, using qemu
+    'ppc64le': 'docker && amd64',
+    's390x': 's390xdocker',
+]
+
 // Set to true in a replay to simulate a LTS build on ci.jenkins.io
 // It will set the environment variables needed for a LTS
 // and disable images publication out of caution
@@ -118,7 +127,7 @@ stage('Build') {
                 def imageToBuild = i
 
                 builds[imageToBuild] = {
-                    nodeWithTimeout('docker') {
+                    nodeWithTimeout(architecturesAndCiJioAgentLabels["amd64"]) {
                         deleteDir()
 
                         stage('Checkout') {
@@ -153,20 +162,19 @@ stage('Build') {
                     }
                 }
             }
-            builds['multiarch-build'] = {
-                nodeWithTimeout('docker') {
-                    stage('Checkout') {
-                        deleteDir()
-                        checkout scm
-                    }
-
-                    // sanity check that proves all images build on declared platforms
-                    stage('Multi arch build') {
-                        infra.withDockerCredentials {
-                            sh '''
-                            make docker-init
-                            docker buildx bake --file docker-bake.hcl linux
-                            '''
+            // Building every other architectures than amd64 on agents with the corresponding labels if available
+            architecturesAndCiJioAgentLabels.findAll { arch, _ -> arch != 'amd64' }.each { architecture, labels ->
+                builds[architecture] = {
+                    nodeWithTimeout(labels) {
+                        stage('Checkout') {
+                            deleteDir()
+                            checkout scm
+                        }
+                        // 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}"
+                            }
                         }
                     }
                 }

Makefile

@@ -57,7 +57,10 @@ endif
 else
 	docker buildx create --use --bootstrap --driver docker-container
 endif
+# There is only an amd64 qemu image
+ifeq ($(ARCH),amd64)
 	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+endif
 
 # Lint check on all Dockerfiles
 hadolint:
@@ -71,6 +74,10 @@ shellcheck:
 build: check-reqs
 	@set -x; $(bake_base_cli) --set '*.platform=linux/$(ARCH)' $(shell make --silent list)
 
+# Build targets depending on the architecture
+buildarch-%: check-reqs
+	@$(bake_base_cli) --set '*.platform=linux/$*' $(shell make --silent listarch-$*)
+
 # Build a specific target with the current architecture
 build-%: check-reqs
 	@$(call check_image,$*)
@@ -92,6 +99,10 @@ platforms:
 list: check-reqs
 	@set -x; make --silent show | jq -r '.target | path(.. | select(.platforms[] | contains("linux/$(ARCH)"))?) | add'
 
+# Return the list of targets depending on the architecture
+listarch-%: check-reqs
+	@make --silent show | jq -r '.target | path(.. | select(.platforms[] | contains("linux/$*"))?) | add'
+
 # Ensure bats exists in the current folder
 bats:
 	git clone https://github.com/bats-core/bats-core bats ;\