From 97d71be8d21a2cbadc20c8a599ed95c6d2dd4935 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 19 Feb 2021 04:16:03 +0100
Subject: [PATCH] fixed jkf

---
 Jenkinsfile | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bfcfa5f..eadbfc9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,41 +17,39 @@ pipeline {
                 sh '''mkdir $WORKSPACE/REL'''
             }
         }
-        parallel {
-            stage("Image Configs") {
-                matrix {
-                    axes {
+        stage("Image Configs") {
+            matrix {
+                axes {
+                    axis {
+                        name 'ImgRelease'
+                        values '3.13', 'edge'
+                    }
+                    axis {
+                        name 'ImgVariant'
+                        values 'default', 'extended'
+                    }
+                }
+                excludes {
+                    exclude {
                         axis {
                             name 'ImgRelease'
-                            values '3.13', 'edge'
+                            values 'edge'
                         }
                         axis {
                             name 'ImgVariant'
-                            values 'default', 'extended'
+                            notValues 'default'
                         }
                     }
-                    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	
-                            '''
-                            }
+                }
+                // 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	
+                        '''
                         }
                     }
                 }