Refactor distribution-build.jenkinsfile for opensearch-dashboards (#4371

) Signed-off-by: Jeff Lu <chunglu@amazon.com>
opensearch-project · Jan 25, 2024 · 27d2d1e · 27d2d1e
1 parent a7f0228
commit 27d2d1e
Showing 1 changed file with 37 additions and 54 deletions.
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -204,35 +204,10 @@ pipeline {
 
                             parallel([
                                 'integ-test': {
-                                    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,
-                                            propagate: false,
-                                            wait: false,
-                                            parameters: [
-                                                string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
-                                                string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
-                                                string(name: 'BUILD_MANIFEST_URL_OPENSEARCH', value: buildManifestUrlOpenSearch),
-                                                booleanParam(name: 'UPDATE_GITHUB_ISSUES', value: true)
-                                            ]
-                                    }
+                                    triggerIntegrationTests(buildManifestUrl, buildManifestUrlOpenSearch)
                                 },
                                 'bwc-test': {
-                                    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,
-                                            propagate: false,
-                                            wait: false,
-                                            parameters: [
-                                                string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
-                                                string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
-                                                string(name: 'AGENT_LABEL', value: AGENT_LINUX_X64)
-                                            ]
-                                    }
+                                    triggerBWCTests(buildManifestUrl)
                                 }
                             ])
                         }
@@ -595,35 +570,10 @@ pipeline {
 
                                     parallel([
                                         'integ-test': {
-                                            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,
-                                                    propagate: false,
-                                                    wait: false,
-                                                    parameters: [
-                                                        string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
-                                                        string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
-                                                        string(name: 'BUILD_MANIFEST_URL_OPENSEARCH', value: buildManifestUrlOpenSearch),
-                                                        booleanParam(name: 'UPDATE_GITHUB_ISSUES', value: true)
-                                                    ]
-                                            }
+                                            triggerIntegrationTests(buildManifestUrl, buildManifestUrlOpenSearch)
                                         },
                                         'bwc-test': {
-                                            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,
-                                                    propagate: false,
-                                                    wait: false,
-                                                    parameters: [
-                                                        string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
-                                                        string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
-                                                        string(name: 'AGENT_LABEL', value: AGENT_LINUX_ARM64)
-                                                    ]
-                                            }
+                                            triggerBWCTests(buildManifestUrl)
                                         }
                                     ])
                                 }
@@ -1104,3 +1054,36 @@ def markStageUnstableIfPluginsFailedToBuild() {
         unstable('Some plugins failed to build. See the ./build.sh step for logs and more details')
     }
 }
+
+def triggerIntegrationTests(String buildManifestUrl, String buildManifestUrlOpenSearch) {
+    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,
+                propagate: false,
+                wait: false,
+                parameters: [
+                    string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
+                    string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
+                    string(name: 'BUILD_MANIFEST_URL_OPENSEARCH', value: buildManifestUrlOpenSearch),
+                    booleanParam(name: 'UPDATE_GITHUB_ISSUES', value: true)
+                ]
+    }
+}
+
+def triggerBWCTests(String buildManifestUrl) {
+    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,
+                propagate: false,
+                wait: false,
+                parameters: [
+                    string(name: 'TEST_MANIFEST', value: TEST_MANIFEST),
+                    string(name: 'BUILD_MANIFEST_URL', value: buildManifestUrl),
+                    string(name: 'AGENT_LABEL', value: AGENT_LINUX_X64)
+                ]
+    }
+}