From 29efa6cd750d560f5e0217a8fa7b16dac62785fb Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 19 Feb 2021 04:12:54 +0100
Subject: [PATCH] jkf

---
 Jenkinsfile | 58 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 024feb4..bfcfa5f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,48 +17,46 @@ pipeline {
                 sh '''mkdir $WORKSPACE/REL'''
             }
         }
-    }
-    parallel {
-        stage("Image Configs") {
-            matrix {
-                axes {
-                    axis {
-                        name 'ImgRelease'
-                        values '3.13', 'edge'
-                    }
-                    axis {
-                        name 'ImgVariant'
-                        values 'default', 'extended'
-                    }
-                }
-                excludes {
-                    exclude {
+        parallel {
+            stage("Image Configs") {
+                matrix {
+                    axes {
                         axis {
                             name 'ImgRelease'
-                            values 'edge'
+                            values '3.13', 'edge'
                         }
                         axis {
                             name 'ImgVariant'
-                            notValues 'default'
+                            values 'default', 'extended'
                         }
                     }
-                }
-                // all the stages here will run in parallel
-                 stages {
-                    stage('Build image') {
-                        steps {
-                        //echo "Do Build for ${$ImgRelease} - ${ImgVariant}"
-                        // Build script
-                        sh '''sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariant
-                        sudo chown jenkins:jenkins -R $WORKSPACE/REL	
-                        '''
+                    excludes {
+                        exclude {
+                            axis {
+                                name 'ImgRelease'
+                                values 'edge'
+                            }
+                            axis {
+                                name 'ImgVariant'
+                                notValues 'default'
+                            }
+                        }
+                    }
+                    // all the stages here will run in parallel
+                    stages {
+                        stage('Build image') {
+                            steps {
+                            //echo "Do Build for ${$ImgRelease} - ${ImgVariant}"
+                            // Build script
+                            sh '''sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariant
+                            sudo chown jenkins:jenkins -R $WORKSPACE/REL	
+                            '''
+                            }
                         }
                     }
                 }
             }
         }
-    }
-    stages {
         stage('Finish') {
             steps {
             // Save generated files