From e1ce5de359e00aaff82c4ff4cd6ab26784ca438a Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Sun, 21 Feb 2021 03:33:36 +0100
Subject: [PATCH] Added comments

---
 Jenkinsfile           |  2 ++
 Jenkinsfile-Squential | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 48edc6f..d1cc1c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,6 +33,7 @@ pipeline {
                         values 'Default-default', 'Extra-extended'
                     }
                 }
+                //Exclude unwanted conbinatinations
                 excludes {
                     exclude {
                         axis {
@@ -49,6 +50,7 @@ pipeline {
                 stages {
                     stage('Build image') {
                         when {
+                            //ImgTypeTest
                             anyOf {
                                 allOf {
                                     expression { return (env.ImgVariant).startsWith('Default-') } 
diff --git a/Jenkinsfile-Squential b/Jenkinsfile-Squential
index 7a78eaa..d7b59fd 100644
--- a/Jenkinsfile-Squential
+++ b/Jenkinsfile-Squential
@@ -29,32 +29,32 @@ pipeline {
                 script{
                     for(ImgRelease in ImgReleaseList){
                         for(ImgVariant in ImgVariantList){
+                            //ImgTypeTest
                             if (env.BuildDefault == 'true' && (ImgVariant).startsWith('Default-')) {
-                            echo 'Building Default'
-                                    BuildThis = true
+                                BuildThis = true
                             } else if (env.BuildExtra == 'true' && (ImgVariant).startsWith('Extra-'))  {
                                 BuildThis = true
-                                echo 'Building Extra'
                             } else {
                                 BuildThis = false
-                                echo 'not building'
                             }
+                            //Exclude unwanted conbinatinations
+                            if (ImgRelease == 'edge' && ImgVariant == 'Extra-extended' ){
+                                BuildThis = false
+                            }
+                            //Check if this combinations shoud be build 
     	                    if (BuildThis == true) {
                                 env.ImgRelease = ImgRelease
                                 env.ImgVariant = ImgVariant
                                 stage('Build image') {
-                                 //   steps {
-                                    // Build script
-                                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                            sh '''echo "$(date) Do Build for $ImgRelease - $ImgVariant"
-                                            ImgVariantName${ImgVariant#Default-} && ImgVariantName${ImgVariantName#Extra-}
-                                            sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariantName
-                                            sudo chown jenkins:jenkins -R $WORKSPACE/REL
-                                            mv $WORKSPACE/REL/$ImgRelease-$ImgVariant/rootfs.tar.xz $ImgVariant-$ImgRelease.tar.xz
-                                            '''
-                                        }
+                                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                        sh '''echo "$(date) Do Build for $ImgRelease - $ImgVariant"
+                                        ImgVariantName${ImgVariant#Default-} && ImgVariantName${ImgVariantName#Extra-}
+                                        sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariantName
+                                        sudo chown jenkins:jenkins -R $WORKSPACE/REL
+                                        mv $WORKSPACE/REL/$ImgRelease-$ImgVariant/rootfs.tar.xz $ImgVariant-$ImgRelease.tar.xz
+                                        '''
                                     }
-                                //}
+                                }
                              }
                         }
                     }