Skip to content

Commit 09e11f9

Browse files
authored
Increase frequence for 2.10 and move old manifests to legacy (#3950)
Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
1 parent dd2a95d commit 09e11f9

35 files changed

+9
-13
lines changed

jenkins/check-for-build.jenkinsfile

+2-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ pipeline {
1717
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
1818
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
1919
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
20-
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
21-
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
22-
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
23-
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
24-
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
25-
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
20+
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
21+
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
2622
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
2723
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
2824
'''

tests/jenkins/TestReleaseNotesCheck.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class TestReleaseNotesCheck extends BuildPipelineTest {
2020
String comment = 'NO_COMMENT'
2121
String gitIssueNumber = '123456'
2222
String commentUniqueID = '123456'
23-
String inputManifest = '2.7.0/opensearch-2.7.0.yml'
23+
String inputManifest = '3.0.0/opensearch-3.0.0.yml'
2424

2525
@Override
2626
@Before

tests/jenkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
release-notes-check.detectDockerAgent()
1111
detectDockerAgent.legacySCM(groovy.lang.Closure)
1212
detectDockerAgent.library({identifier=jenkins@1.0.4, retriever=null})
13-
detectDockerAgent.readYaml({file=manifests/2.7.0/opensearch-2.7.0.yml})
13+
detectDockerAgent.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml})
1414
InputManifest.asBoolean()
15-
detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2 (-e JAVA_HOME=/opt/java/openjdk-17))
16-
detectDockerAgent.echo(Using java version openjdk-17)
15+
detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 (-e JAVA_HOME=/opt/java/openjdk-20))
16+
detectDockerAgent.echo(Using java version openjdk-20)
1717
release-notes-check.postCleanup()
1818
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
1919
release-notes-check.stage(Parameters Check, groovy.lang.Closure)

tests/test_run_ci.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_main(self, mock_lists: Mock, mock_temp: Mock, *mocks: Any) -> None:
5151
self.assertEqual(mock_lists.return_value.checkout.call_count, mock_lists.call_count)
5252
self.assertEqual(mock_lists.return_value.check.call_count, mock_lists.call_count)
5353

54-
OPENSEARCH_TEST_MANIFEST = os.path.realpath(os.path.join(os.path.dirname(__file__), "../manifests/1.3.8/opensearch-1.3.8-test.yml"))
54+
OPENSEARCH_TEST_MANIFEST = os.path.realpath(os.path.join(os.path.dirname(__file__), "../manifests/3.0.0/opensearch-3.0.0-test.yml"))
5555

5656
@patch("argparse._sys.argv", ["run_ci.py", OPENSEARCH_TEST_MANIFEST])
5757
@patch("logging.info")

tests/tests_manifests_workflow/test_input_manifests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ def test_files(self) -> None:
3131

3232
def test_files_opensearch(self) -> None:
3333
files = InputManifests.files("opensearch")
34-
self.assertTrue(os.path.join(InputManifests.manifests_path(), os.path.join("1.3.8", "opensearch-1.3.8.yml")) in files)
34+
self.assertTrue(os.path.join(InputManifests.manifests_path(), os.path.join("3.0.0", "opensearch-3.0.0.yml")) in files)
3535
self.assertTrue(os.path.join(InputManifests.legacy_manifests_path(), os.path.join("1.2.1", "opensearch-1.2.1.yml")) in files)
3636

3737
def test_files_opensearch_dashboards(self) -> None:
3838
files = InputManifests.files("opensearch-dashboards")
39-
self.assertTrue(os.path.join(InputManifests.manifests_path(), os.path.join("1.3.8", "opensearch-dashboards-1.3.8.yml")) in files)
39+
self.assertTrue(os.path.join(InputManifests.manifests_path(), os.path.join("3.0.0", "opensearch-dashboards-3.0.0.yml")) in files)
4040
self.assertTrue(os.path.join(InputManifests.legacy_manifests_path(), os.path.join("1.2.1", "opensearch-dashboards-1.2.1.yml")) in files)
4141

4242
def test_create_manifest_opensearch(self) -> None:

0 commit comments

Comments
 (0)