More testing of booleans

Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Sep 9, 2024 · 2b489ed · 2b489ed
1 parent fe1cda2
commit 2b489ed
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -747,7 +747,7 @@ class Build {
             context.stage('sign') {
                 def filter = ''
 
-                def nodeFilter = 'eclipse-codesign'
+                def nodeFilter = 'eclipse-codesign '
 
                 if (buildConfig.TARGET_OS == 'windows') {
                     filter = '**/OpenJDK*_windows_*.zip'
@@ -899,6 +899,7 @@ class Build {
                             target: 'workspace/target/',
                             flatten: true)
                         // Check if JRE exists, if so, build another installer for it
+context.println("902 - calling listArchives(false)")
                         if (listArchives(false).any { it =~ /-jre/ } ) { buildWindowsInstaller(versionData, '**/OpenJDK*jre_*_windows*.zip', 'jre') }
                         break
                     default:
@@ -1056,10 +1057,15 @@ class Build {
     /*
     Lists and returns any compressed archived or sbom file contents of the top directory of the build node
     */
-    List<String> listArchives(forceShell) {
+    List<String> listArchives(Boolean forceShell) {
         context.println "SXA: battable and batted 1060 - windbld#273 - forceShell = ${forceShell}"
 
         def files
+        context.println "forceShell = ${forceShell} / $forceShell"
+        if ( forceShell ) { context.println("1.FS = true") }
+        if ( forceShell == true ) { context.println("2.FS = true") }
+        if ( !forceShell ) { context.println("3.FS = true") }
+
         if ( buildConfig.TARGET_OS == 'windows' && buildConfig.DOCKER_IMAGE && !forceShell ) { 
            // The grep here removes anything that still contains "*" because nothing matched
            files = context.bat(
@@ -1678,8 +1684,13 @@ class Build {
                                    context.println("SXAEC2: Matched") } else { context.println("SXAEC2: Not matched") }
                                 if (buildConfig.ENABLE_SIGNER == 'true') {
                                    context.println("SXAEC3: Matched") } else { context.println("SXAEC3: Not matched") }
-                                if ((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && buildConfig.JAVA_TO_BUILD != 'jdk8u' && enableSigner) {
-                                   context.println("SXAEC4: Matched") } else { context.println("SXAEC4: Not matched") }
+//                                if ((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && buildConfig.JAVA_TO_BUILD != 'jdk8u' && enableSigner == true) {
+//                                if (enableSigner == true) {
+//                                   context.println("SXAEC4: Matched") } else { context.println("SXAEC4: Not matched") }
+                                if (enableSigner) {
+                                   context.println("SXAEC5: Matched") } else { context.println("SXAEC5: Not matched") }
+                                if ((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && buildConfig.JAVA_TO_BUILD != 'jdk8u' && enableSigner == true) {
+                                   context.println("SXAEC6: Matched") } else { context.println("SXAEC6: Not matched") }
                                 if ((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && buildConfig.JAVA_TO_BUILD != 'jdk8u') {
                                     context.println "Processing exploded build, sign JMODS, and assemble build, for platform ${buildConfig.TARGET_OS} version ${buildConfig.JAVA_TO_BUILD}"
                                     def signBuildArgs