Increase frequence for 2.10 and move old manifests to legacy (#3950)

Signed-off-by: Sayali Gaikawad <[email protected]>
opensearch-project · Aug 31, 2023 · 09e11f9 · 09e11f9
1 parent dd2a95d
commit 09e11f9
Show file tree

Hide file tree

Showing 35 changed files with 9 additions and 13 deletions.
diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile
@@ -17,12 +17,8 @@ pipeline {
             H 1 * * * %INPUT_MANIFEST=1.3.13/opensearch-dashboards-1.3.13.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=1.3.13/opensearch-1.3.13.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=2.9.1/opensearch-2.9.1.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H 1 * * * %INPUT_MANIFEST=2.10.0/opensearch-dashboards-2.10.0.yml;TEST_MANIFEST=2.10.0/opensearch-dashboards-2.10.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H 1 * * * %INPUT_MANIFEST=2.10.0/opensearch-2.10.0.yml;TEST_MANIFEST=2.10.0/opensearch-2.10.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H 1 * * * %INPUT_MANIFEST=2.8.1/opensearch-dashboards-2.8.1.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H 1 * * * %INPUT_MANIFEST=2.8.1/opensearch-2.8.1.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H 1 * * * %INPUT_MANIFEST=1.4.0/opensearch-1.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm zip
-            H 1 * * * %INPUT_MANIFEST=1.4.0/opensearch-dashboards-1.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm zip
+            H/60 * * * * %INPUT_MANIFEST=2.10.0/opensearch-dashboards-2.10.0.yml;TEST_MANIFEST=2.10.0/opensearch-dashboards-2.10.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
+            H/60 * * * * %INPUT_MANIFEST=2.10.0/opensearch-2.10.0.yml;TEST_MANIFEST=2.10.0/opensearch-2.10.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TEST_MANIFEST=3.0.0/opensearch-3.0.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-dashboards-3.0.0.yml;TEST_MANIFEST=opensearch-dashboards-3.0.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
         '''

diff --git a/manifests/1.3.10/opensearch-1.3.10-test.yml → ...nifests/1.3.10/opensearch-1.3.10-test.yml b/manifests/1.3.10/opensearch-1.3.10-test.yml → ...nifests/1.3.10/opensearch-1.3.10-test.yml
diff --git a/manifests/1.3.10/opensearch-1.3.10.yml → ...cy-manifests/1.3.10/opensearch-1.3.10.yml b/manifests/1.3.10/opensearch-1.3.10.yml → ...cy-manifests/1.3.10/opensearch-1.3.10.yml
diff --git a/....10/opensearch-dashboards-1.3.10-test.yml → ....10/opensearch-dashboards-1.3.10-test.yml b/....10/opensearch-dashboards-1.3.10-test.yml → ....10/opensearch-dashboards-1.3.10-test.yml
diff --git a/...s/1.3.10/opensearch-dashboards-1.3.10.yml → ...s/1.3.10/opensearch-dashboards-1.3.10.yml b/...s/1.3.10/opensearch-dashboards-1.3.10.yml → ...s/1.3.10/opensearch-dashboards-1.3.10.yml
diff --git a/manifests/1.3.8/opensearch-1.3.8-test.yml → ...manifests/1.3.8/opensearch-1.3.8-test.yml b/manifests/1.3.8/opensearch-1.3.8-test.yml → ...manifests/1.3.8/opensearch-1.3.8-test.yml
diff --git a/manifests/1.3.8/opensearch-1.3.8.yml → legacy-manifests/1.3.8/opensearch-1.3.8.yml b/manifests/1.3.8/opensearch-1.3.8.yml → legacy-manifests/1.3.8/opensearch-1.3.8.yml
diff --git a/....3.8/opensearch-dashboards-1.3.8-test.yml → ....3.8/opensearch-dashboards-1.3.8-test.yml b/....3.8/opensearch-dashboards-1.3.8-test.yml → ....3.8/opensearch-dashboards-1.3.8-test.yml
diff --git a/...sts/1.3.8/opensearch-dashboards-1.3.8.yml → ...sts/1.3.8/opensearch-dashboards-1.3.8.yml b/...sts/1.3.8/opensearch-dashboards-1.3.8.yml → ...sts/1.3.8/opensearch-dashboards-1.3.8.yml
diff --git a/manifests/1.3.9/opensearch-1.3.9-test.yml → ...manifests/1.3.9/opensearch-1.3.9-test.yml b/manifests/1.3.9/opensearch-1.3.9-test.yml → ...manifests/1.3.9/opensearch-1.3.9-test.yml
diff --git a/manifests/1.3.9/opensearch-1.3.9.yml → legacy-manifests/1.3.9/opensearch-1.3.9.yml b/manifests/1.3.9/opensearch-1.3.9.yml → legacy-manifests/1.3.9/opensearch-1.3.9.yml
diff --git a/....3.9/opensearch-dashboards-1.3.9-test.yml → ....3.9/opensearch-dashboards-1.3.9-test.yml b/....3.9/opensearch-dashboards-1.3.9-test.yml → ....3.9/opensearch-dashboards-1.3.9-test.yml
diff --git a/...sts/1.3.9/opensearch-dashboards-1.3.9.yml → ...sts/1.3.9/opensearch-dashboards-1.3.9.yml b/...sts/1.3.9/opensearch-dashboards-1.3.9.yml → ...sts/1.3.9/opensearch-dashboards-1.3.9.yml
diff --git a/manifests/2.6.0/opensearch-2.6.0-test.yml → ...manifests/2.6.0/opensearch-2.6.0-test.yml b/manifests/2.6.0/opensearch-2.6.0-test.yml → ...manifests/2.6.0/opensearch-2.6.0-test.yml
diff --git a/manifests/2.6.0/opensearch-2.6.0.yml → legacy-manifests/2.6.0/opensearch-2.6.0.yml b/manifests/2.6.0/opensearch-2.6.0.yml → legacy-manifests/2.6.0/opensearch-2.6.0.yml
diff --git a/....6.0/opensearch-dashboards-2.6.0-test.yml → ....6.0/opensearch-dashboards-2.6.0-test.yml b/....6.0/opensearch-dashboards-2.6.0-test.yml → ....6.0/opensearch-dashboards-2.6.0-test.yml
diff --git a/...sts/2.6.0/opensearch-dashboards-2.6.0.yml → ...sts/2.6.0/opensearch-dashboards-2.6.0.yml b/...sts/2.6.0/opensearch-dashboards-2.6.0.yml → ...sts/2.6.0/opensearch-dashboards-2.6.0.yml
diff --git a/manifests/2.6.1/opensearch-2.6.1.yml → legacy-manifests/2.6.1/opensearch-2.6.1.yml b/manifests/2.6.1/opensearch-2.6.1.yml → legacy-manifests/2.6.1/opensearch-2.6.1.yml
diff --git a/...search-2.7.0-segment-replication-test.yml → ...search-2.7.0-segment-replication-test.yml b/...search-2.7.0-segment-replication-test.yml → ...search-2.7.0-segment-replication-test.yml
diff --git a/manifests/2.7.0/opensearch-2.7.0-test.yml → ...manifests/2.7.0/opensearch-2.7.0-test.yml b/manifests/2.7.0/opensearch-2.7.0-test.yml → ...manifests/2.7.0/opensearch-2.7.0-test.yml
diff --git a/manifests/2.7.0/opensearch-2.7.0.yml → legacy-manifests/2.7.0/opensearch-2.7.0.yml b/manifests/2.7.0/opensearch-2.7.0.yml → legacy-manifests/2.7.0/opensearch-2.7.0.yml
diff --git a/....7.0/opensearch-dashboards-2.7.0-test.yml → ....7.0/opensearch-dashboards-2.7.0-test.yml b/....7.0/opensearch-dashboards-2.7.0-test.yml → ....7.0/opensearch-dashboards-2.7.0-test.yml
diff --git a/...sts/2.7.0/opensearch-dashboards-2.7.0.yml → ...sts/2.7.0/opensearch-dashboards-2.7.0.yml b/...sts/2.7.0/opensearch-dashboards-2.7.0.yml → ...sts/2.7.0/opensearch-dashboards-2.7.0.yml
diff --git a/manifests/2.7.1/opensearch-2.7.1.yml → legacy-manifests/2.7.1/opensearch-2.7.1.yml b/manifests/2.7.1/opensearch-2.7.1.yml → legacy-manifests/2.7.1/opensearch-2.7.1.yml
diff --git a/...sts/2.7.1/opensearch-dashboards-2.7.1.yml → ...sts/2.7.1/opensearch-dashboards-2.7.1.yml b/...sts/2.7.1/opensearch-dashboards-2.7.1.yml → ...sts/2.7.1/opensearch-dashboards-2.7.1.yml
diff --git a/manifests/2.8.0/opensearch-2.8.0-test.yml → ...manifests/2.8.0/opensearch-2.8.0-test.yml b/manifests/2.8.0/opensearch-2.8.0-test.yml → ...manifests/2.8.0/opensearch-2.8.0-test.yml
diff --git a/manifests/2.8.0/opensearch-2.8.0.yml → legacy-manifests/2.8.0/opensearch-2.8.0.yml b/manifests/2.8.0/opensearch-2.8.0.yml → legacy-manifests/2.8.0/opensearch-2.8.0.yml
diff --git a/....8.0/opensearch-dashboards-2.8.0-test.yml → ....8.0/opensearch-dashboards-2.8.0-test.yml b/....8.0/opensearch-dashboards-2.8.0-test.yml → ....8.0/opensearch-dashboards-2.8.0-test.yml
diff --git a/...sts/2.8.0/opensearch-dashboards-2.8.0.yml → ...sts/2.8.0/opensearch-dashboards-2.8.0.yml b/...sts/2.8.0/opensearch-dashboards-2.8.0.yml → ...sts/2.8.0/opensearch-dashboards-2.8.0.yml
diff --git a/manifests/2.8.1/opensearch-2.8.1.yml → legacy-manifests/2.8.1/opensearch-2.8.1.yml b/manifests/2.8.1/opensearch-2.8.1.yml → legacy-manifests/2.8.1/opensearch-2.8.1.yml
diff --git a/...sts/2.8.1/opensearch-dashboards-2.8.1.yml → ...sts/2.8.1/opensearch-dashboards-2.8.1.yml b/...sts/2.8.1/opensearch-dashboards-2.8.1.yml → ...sts/2.8.1/opensearch-dashboards-2.8.1.yml
diff --git a/tests/jenkins/TestReleaseNotesCheck.groovy b/tests/jenkins/TestReleaseNotesCheck.groovy
@@ -20,7 +20,7 @@ class TestReleaseNotesCheck extends BuildPipelineTest {
     String comment = 'NO_COMMENT'
     String gitIssueNumber = '123456'
     String commentUniqueID = '123456'
-    String inputManifest = '2.7.0/opensearch-2.7.0.yml'
+    String inputManifest = '3.0.0/opensearch-3.0.0.yml'
 
     @Override
     @Before

diff --git a/...nkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt b/...nkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt
@@ -10,10 +10,10 @@
                release-notes-check.detectDockerAgent()
                   detectDockerAgent.legacySCM(groovy.lang.Closure)
                   detectDockerAgent.library({[email protected], retriever=null})
-                  detectDockerAgent.readYaml({file=manifests/2.7.0/opensearch-2.7.0.yml})
+                  detectDockerAgent.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml})
                   InputManifest.asBoolean()
-                  detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 (-e JAVA_HOME=/opt/java/openjdk-17))
-                  detectDockerAgent.echo(Using java version openjdk-17)
+                  detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 (-e JAVA_HOME=/opt/java/openjdk-20))
+                  detectDockerAgent.echo(Using java version openjdk-20)
          release-notes-check.postCleanup()
             postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
          release-notes-check.stage(Parameters Check, groovy.lang.Closure)

diff --git a/tests/test_run_ci.py b/tests/test_run_ci.py
@@ -51,7 +51,7 @@ def test_main(self, mock_lists: Mock, mock_temp: Mock, *mocks: Any) -> None:
         self.assertEqual(mock_lists.return_value.checkout.call_count, mock_lists.call_count)
         self.assertEqual(mock_lists.return_value.check.call_count, mock_lists.call_count)
 
-    OPENSEARCH_TEST_MANIFEST = os.path.realpath(os.path.join(os.path.dirname(__file__), "../manifests/1.3.8/opensearch-1.3.8-test.yml"))
+    OPENSEARCH_TEST_MANIFEST = os.path.realpath(os.path.join(os.path.dirname(__file__), "../manifests/3.0.0/opensearch-3.0.0-test.yml"))
 
     @patch("argparse._sys.argv", ["run_ci.py", OPENSEARCH_TEST_MANIFEST])
     @patch("logging.info")

diff --git a/tests/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py
@@ -31,12 +31,12 @@ def test_files(self) -> None:
 
     def test_files_opensearch(self) -> None:
         files = InputManifests.files("opensearch")
-        self.assertTrue(os.path.join(InputManifests.manifests_path(), os.path.join("1.3.8", "opensearch-1.3.8.yml")) in files)
+        self.assertTrue(os.path.join(InputManifests.manifests_path(), os.path.join("3.0.0", "opensearch-3.0.0.yml")) in files)
         self.assertTrue(os.path.join(InputManifests.legacy_manifests_path(), os.path.join("1.2.1", "opensearch-1.2.1.yml")) in files)
 
     def test_files_opensearch_dashboards(self) -> None:
         files = InputManifests.files("opensearch-dashboards")
-        self.assertTrue(os.path.join(InputManifests.manifests_path(), os.path.join("1.3.8", "opensearch-dashboards-1.3.8.yml")) in files)
+        self.assertTrue(os.path.join(InputManifests.manifests_path(), os.path.join("3.0.0", "opensearch-dashboards-3.0.0.yml")) in files)
         self.assertTrue(os.path.join(InputManifests.legacy_manifests_path(), os.path.join("1.2.1", "opensearch-dashboards-1.2.1.yml")) in files)
 
     def test_create_manifest_opensearch(self) -> None: