More tweaks

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Aug 28, 2024 · 966f0d3 · 966f0d3
1 parent 7cd6d2f
commit 966f0d3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile
@@ -23,10 +23,10 @@ pipeline {
     }
     triggers {
         parameterizedCron '''
-            H 1 * * * %INPUT_MANIFEST=2.16.1/opensearch-2.16.1.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H 1 * * * %INPUT_MANIFEST=2.17.0/opensearch-2.17.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H 1 * * * %INPUT_MANIFEST=2.17.0/opensearch-dashboards-2.17.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
+            H 1 * * * %INPUT_MANIFEST=2.16.1/opensearch-2.16.1.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
+            H 1 * * * %INPUT_MANIFEST=2.17.0/opensearch-2.17.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip;TEST_MANIFEST=2.17.0/opensearch-2.17.0-test.yml;TEST_PLATFORM=linux;TEST_DISTRIBUTION=tar
+            H 1 * * * %INPUT_MANIFEST=2.17.0/opensearch-dashboards-2.17.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip;TEST_MANIFEST=2.17.0/opensearch-2.17.0-test.yml;TEST_PLATFORM=linux;TEST_DISTRIBUTION=tar
+            H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-dashboards-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
         '''
     }
@@ -56,6 +56,16 @@ pipeline {
             description: 'Distribution to build',
             trim: true
         )
+        string(
+            name: 'TEST_PLATFORM',
+            description: 'Platform to test',
+            trim: true
+        )
+        string(
+            name: 'TEST_DISTRIBUTION',
+            description: 'Distribution to test',
+            trim: true
+        )
     }
     stages {
         stage('detect docker image + args') {
@@ -102,6 +112,8 @@ pipeline {
                             string(name: 'TEST_MANIFEST', value: "${TEST_MANIFEST}"),
                             string(name: 'BUILD_PLATFORM', value: "${BUILD_PLATFORM}"),
                             string(name: 'BUILD_DISTRIBUTION', value: "${BUILD_DISTRIBUTION}")
+                            string(name: 'TEST_PLATFORM', value: "${TEST_PLATFORM}"),
+                            string(name: 'TEST_DISTRIBUTION', value: "${TEST_DISTRIBUTION}")
                             ], wait: true
 
                             echo "Build succeeded, uploading build SHA for that job"

diff --git a/src/manifests_workflow/input_manifests.py b/src/manifests_workflow/input_manifests.py
@@ -169,12 +169,24 @@ def add_to_cron(self, version: str) -> None:
         with open(jenkinsfile, "r") as f:
             data = f.read()
 
-        # TODO: default to linux tar for now as integTest is very heavy on resources
+        # Note: default to linux tar for now as integTest is very heavy on resources
+        build_platform_map = {
+            "opensearch": "linux windows",
+            "opensearch-dashboards": "linux windows"
+        }
+        build_distribution_map = {
+            "opensearch": "tar rpm deb zip",
+            "opensearch-dashboards": "tar rpm deb zip"
+        }
+        build_platform = build_platform_map.get(self.prefix, "linux")
+        build_distribution = build_distribution_map.get(self.prefix, "tar")
         test_platform = "linux"
         test_distribution = "tar"
 
         cron_entry = f"H 1 * * * %INPUT_MANIFEST={version}/{self.prefix}-{version}.yml;" \
                      f"TARGET_JOB_NAME=distribution-build-{self.prefix};" \
+                     f"BUILD_PLATFORM={build_platform};" \
+                     f"BUILD_DISTRIBUTION={build_distribution};" \
                      f"TEST_MANIFEST={version}/{self.prefix}-{version}-test.yml;" \
                      f"TEST_PLATFORM={test_platform};" \
                      f"TEST_DISTRIBUTION={test_distribution}\n"