Is a stage even required?

1 files changed, 9 insertions, 18 deletions

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index ceaeae56e..5bcf2fb11 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -111,8 +111,6 @@ gnu_make = ['freebsd': 'gmake', 'macos': 'make']
 // We use an initial stage to dynamically generate the list of parallel stages
 // to run afterwards. This keeps our Jenkinsfile DRY and gives us more
 // flexibility and better UX than the matrix pipeline.
-def parallelStagesMap
-
 def generateNativeStage(platform) {
   return {
     stage(meta[platform].name) {
@@ -232,6 +230,15 @@ def generateContainerStage(platform) {
   }
 }
 
+def parallelStagesMap = meta.collectEntries { key, values ->
+  if (values.image) {
+    [key: generateContainerStage(key)]
+  }
+  else {
+    [key: generateNativeStage(key)]
+  }
+}
+
 pipeline {
 
   // no top-level agent; agents must be declared for each stage
@@ -298,22 +305,6 @@ pipeline {
       }
     } // stage Build Release Tarball
 
-    stage('Generate Test Matrix') {
-      agent any
-      steps {
-        script {
-          parallelStagesMap = meta.collectEntries { key, platform ->
-            if (platform.image) {
-              [key: generateContainerStage(key)]
-            }
-            else {
-              [key: generateNativeStage(key)]
-            }
-          }
-        }
-      }
-    }
-
     stage('Test and Package') {
       steps {
         script {