fix?

Jenkinsfile-Squential

@@ -29,19 +29,18 @@ pipeline {
                 script{
                     for(ImgRelease in ImgReleaseList){
                         for(ImgVariant in ImgVariantList){
+                            if (BuildDefault == 'true' && (ImgVariant).startsWith('Default-')) {
+                            echo 'Building Default'
+                                    BuildThisLocal = true
+                            } else if (BuildExtra == 'true' && (ImgVariant).startsWith('Extra-'))  {
+                                BuildThisLocal = true
+                                echo 'Building Extra'
+                            } else {
+                                BuildThisLocal = false
+                                echo 'not building'
+                            }
+    	                    if (BuildThisLocal == 'true') {
                                 stage('Build image') {
-                                when {
-                                    anyOf {
-                                        allOf {
-                                            expression { return (ImgVariant).startsWith('Default-') } 
-                                            environment name: 'BuildDefault', value: 'true'
-                                        }
-                                        allOf {
-                                            expression { return (ImgVariant).startsWith('Extra-') }
-                                            environment name: 'BuildExtra', value: 'true'
-                                        }
-                                    }
-                                }
                                     steps {
                                     // Build script
                                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
@@ -59,6 +58,7 @@ pipeline {
                     }
                 }
             }
+        }
         stage('Finish') {
             steps {
             // Save generated files