Add check before triggering tests from distribution build jobs (#4068)

Signed-off-by: Sayali Gaikawad <[email protected]>
opensearch-project · Sep 25, 2023 · 02e05de · 02e05de
1 parent 277e2b4
commit 02e05de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -182,8 +182,8 @@ pipeline {
 
                             parallel([
                                 'integ-test': {
-                                    Boolean skipIntegTests = INTEG_TEST_JOB_NAME == ''
-                                    echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}"
+                                    Boolean skipIntegTests = (INTEG_TEST_JOB_NAME == '' || TEST_MANIFEST == '' || buildManifestUrl == '' || buildManifestUrlOpenSearch == '')
+                                    echo "${skipIntegTests ? 'Skipping integration tests as one of the values has empty string: INTEG_TEST_JOB_NAME, TEST_MANIFEST, buildManifestUrl, buildManifestUrlOpenSearch' : 'Running integration tests'}"
                                     if (!skipIntegTests) {
                                         def integTestResults =
                                             build job: INTEG_TEST_JOB_NAME,
@@ -197,8 +197,8 @@ pipeline {
                                     }
                                 },
                                 'bwc-test': {
-                                    Boolean skipBwcTests = BWC_TEST_JOB_NAME == ''
-                                    echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}"
+                                    Boolean skipBwcTests = (BWC_TEST_JOB_NAME == '' || TEST_MANIFEST == '' || buildManifestUrl == '')
+                                    echo "${skipBwcTests ? 'Skipping BWC tests as one of the values has empty string: BWC_TEST_JOB_NAME, TEST_MANIFEST, buildManifestUrl' : 'Running BWC tests'}"
                                     if (!skipBwcTests) {
                                         def bwcTestResults =
                                             build job: BWC_TEST_JOB_NAME,
@@ -492,8 +492,8 @@ pipeline {
 
                                     parallel([
                                         'integ-test': {
-                                            Boolean skipIntegTests = INTEG_TEST_JOB_NAME == ''
-                                            echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}"
+                                            Boolean skipIntegTests = (INTEG_TEST_JOB_NAME == ''|| TEST_MANIFEST == '' || buildManifestUrl == '' || buildManifestUrlOpenSearch == '')
+                                            echo "${skipIntegTests ? 'Skipping integration tests as one of the values has empty string:INTEG_TEST_JOB_NAME, TEST_MANIFEST, buildManifestUrl, buildManifestUrlOpenSearch' : 'Running integration tests'}"
                                             if (!skipIntegTests) {
                                                 def integTestResults =
                                                     build job: INTEG_TEST_JOB_NAME,
@@ -507,8 +507,8 @@ pipeline {
                                             }
                                         },
                                         'bwc-test': {
-                                            Boolean skipBwcTests = BWC_TEST_JOB_NAME == ''
-                                            echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}"
+                                            Boolean skipBwcTests = (BWC_TEST_JOB_NAME == ''|| TEST_MANIFEST == '' || buildManifestUrl == '')
+                                            echo "${skipBwcTests ? 'Skipping BWC tests as one of the values has empty string: BWC_TEST_JOB_NAME, TEST_MANIFEST, buildManifestUrl' : 'Running BWC tests'}"
                                             if (!skipBwcTests) {
                                                 def bwcTestResults =
                                                     build job: BWC_TEST_JOB_NAME,

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -310,8 +310,8 @@ pipeline {
 
                             parallel([
                                 'integ-test': {
-                                    Boolean skipIntegTests = INTEG_TEST_JOB_NAME == ''
-                                    echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}"
+                                    Boolean skipIntegTests = (INTEG_TEST_JOB_NAME == '' || TEST_MANIFEST == '' || buildManifestUrl == '')
+                                    echo "${skipIntegTests ? 'Skipping integration tests as one of the values has empty string: INTEG_TEST_JOB_NAME, TEST_MANIFEST, buildManifestUrl' : 'Running integration tests'}"
                                     if (!skipIntegTests) {
                                         def integTestResults =
                                             build job: INTEG_TEST_JOB_NAME,
@@ -324,8 +324,8 @@ pipeline {
                                     }
                                 },
                                 'bwc-test': {
-                                    Boolean skipBwcTests = BWC_TEST_JOB_NAME == ''
-                                    echo "${skipBwcTests ? 'Skipping BWC tests' : 'Running BWC tests'}"
+                                    Boolean skipBwcTests = (BWC_TEST_JOB_NAME == '' || TEST_MANIFEST == '' || buildManifestUrl == '')
+                                    echo "${skipBwcTests ? 'Skipping BWC tests as one of the values has empty string: BWC_TEST_JOB_NAME, TEST_MANIFEST, buildManifestUrl' : 'Running BWC tests'}"
                                     if (!skipBwcTests) {
                                         def bwcTestResults =
                                             build job: BWC_TEST_JOB_NAME,
@@ -566,8 +566,8 @@ pipeline {
 
                             parallel([
                                 'integ-test': {
-                                    Boolean skipIntegTests = INTEG_TEST_JOB_NAME == ''
-                                    echo "${skipIntegTests ? 'Skipping integration tests' : 'Running integration tests'}"
+                                    Boolean skipIntegTests = (INTEG_TEST_JOB_NAME == '' || TEST_MANIFEST == '' || buildManifestUrl == '')
+                                    echo "${skipIntegTests ? 'Skipping integration tests as one of the values has empty string: INTEG_TEST_JOB_NAME, TEST_MANIFEST, buildManifestUrl' : 'Running integration tests'}"
                                     if (!skipIntegTests) {
                                         def integTestResults =
                                             build job: INTEG_TEST_JOB_NAME,