Set smoke tests non-blocking

Signed-off-by: Lan Xia <[email protected]>
ibmruntimes · Mar 20, 2024 · 17664b5 · 17664b5
1 parent 777a288
commit 17664b5
Showing 1 changed file with 19 additions and 22 deletions.
diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -2505,31 +2505,28 @@ class Build {
                 // Run Smoke Tests and AQA Tests
                 if (enableTests) {
                     try {
-                        //Only smoke tests succeed TCK and AQA tests will be triggerred.
-                        if (runSmokeTests() == 'SUCCESS') {
-                            // Remote trigger Eclipse Temurin JCK tests
-                            if (buildConfig.VARIANT == 'temurin' && enableTCK) {
-                                def platform = ''
-                                if (buildConfig.ARCHITECTURE.contains('x64')) {
-                                    platform = 'x86-64_' + buildConfig.TARGET_OS
-                                } else {
-                                    platform = buildConfig.ARCHITECTURE + '_' + buildConfig.TARGET_OS
-                                }           
-                                if ( !(platform  == 'riscv64_linux' || platform =='aarch64_windows') ) {
-                                    if ( !(buildConfig.JAVA_TO_BUILD == 'jdk8u' && platform == 's390x_linux') ) {
-                                        context.echo "Remote trigger Eclipse Temurin AQA_Test_Pipeline job with ${platform} ${buildConfig.JAVA_TO_BUILD}"
-                                        def remoteTargets = remoteTriggerJckTests(platform, filename)
-                                        context.parallel remoteTargets
-                                    }
+                        // Set smoke tests non-blocking
+                        runSmokeTests()
+                        // Remote trigger Eclipse Temurin JCK tests
+                        if (buildConfig.VARIANT == 'temurin' && enableTCK) {
+                            def platform = ''
+                            if (buildConfig.ARCHITECTURE.contains('x64')) {
+                                platform = 'x86-64_' + buildConfig.TARGET_OS
+                            } else {
+                                platform = buildConfig.ARCHITECTURE + '_' + buildConfig.TARGET_OS
+                            }           
+                            if ( !(platform  == 'riscv64_linux' || platform =='aarch64_windows') ) {
+                                if ( !(buildConfig.JAVA_TO_BUILD == 'jdk8u' && platform == 's390x_linux') ) {
+                                    context.echo "Remote trigger Eclipse Temurin AQA_Test_Pipeline job with ${platform} ${buildConfig.JAVA_TO_BUILD}"
+                                    def remoteTargets = remoteTriggerJckTests(platform, filename)
+                                    context.parallel remoteTargets
                                 }
                             }
+                        }
 
-                            if (buildConfig.TEST_LIST.size() > 0) {
-                                def testStages = runAQATests()
-                                context.parallel testStages
-                            }
-                        } else {
-                            context.println('[ERROR]Smoke tests are not successful! AQA and Tck tests are blocked ')
+                        if (buildConfig.TEST_LIST.size() > 0) {
+                            def testStages = runAQATests()
+                            context.parallel testStages
                         }
                     } catch (Exception e) {
                         context.println(e.message)