fixup move multi-arch stage def outside the image types loop

Author: lemeurherve

Jenkinsfile

@@ -109,31 +109,32 @@ def parallelStages = [failFast: false]
             }
         }
     }
-    parallelStages['multi-arch'] = {
-        imageType = 'linux'
-        withEnv(["IMAGE_TYPE=${imageType}", "REGISTRY_ORG=${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}"]) {
-            int retryCounter = 0
-            retry(count: 2, conditions: [agent(), nonresumable()]) {
-                // Use local variable to manage concurrency and increment BEFORE spinning up any agent
-                final String resolvedAgentLabel = spotAgentSelector(agentSelector(imageType), retryCounter)
-                retryCounter++
-                node(resolvedAgentLabel) {
-                    timeout(time: 60, unit: 'MINUTES') {
-                        checkout scm
-                        stage('Prepare Docker') {
-                            if (infra.isTrusted()) {
-                                echo 'INFO:Running on trusted.ci.jenkins.io, skipping'
-                            } else {
-                                sh 'make docker-init'
-                            }
+}
+
+parallelStages['multi-arch'] = {
+    imageType = 'linux'
+    withEnv(["IMAGE_TYPE=${imageType}", "REGISTRY_ORG=${infra.isTrusted() ? 'jenkins' : 'jenkins4eval'}"]) {
+        int retryCounter = 0
+        retry(count: 2, conditions: [agent(), nonresumable()]) {
+            // Use local variable to manage concurrency and increment BEFORE spinning up any agent
+            final String resolvedAgentLabel = spotAgentSelector(agentSelector(imageType), retryCounter)
+            retryCounter++
+            node(resolvedAgentLabel) {
+                timeout(time: 60, unit: 'MINUTES') {
+                    checkout scm
+                    stage('Prepare Docker') {
+                        if (infra.isTrusted()) {
+                            echo 'INFO:Running on trusted.ci.jenkins.io, skipping'
+                        } else {
+                            sh 'make docker-init'
                         }
-                        // Publication of multi-arch images is already taken care of with `make publish`
-                        stage('Multi-Arch Build') {
-                            if (infra.isTrusted()) {
-                                echo 'INFO: Running on trusted.ci.jenkins.io, skipping'
-                            } else {
-                                sh 'make every-build'
-                            }
+                    }
+                    // Publication of multi-arch images is already taken care of with `make publish`
+                    stage('Multi-Arch Build') {
+                        if (infra.isTrusted()) {
+                            echo 'INFO: Running on trusted.ci.jenkins.io, skipping'
+                        } else {
+                            sh 'make every-build'
                         }
                     }
                 }
@@ -142,6 +143,7 @@ def parallelStages = [failFast: false]
     }
 }
 
+
 // Execute parallel stages
 parallel parallelStages
 // // vim: ft=groovy