Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move old manifests to legacy #3473

Merged
merged 1 commit into from
May 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/jenkins/TestReleaseNotesCheck.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TestReleaseNotesCheck extends BuildPipelineTest {
String comment = 'NO_COMMENT'
String gitIssueNumber = '123456'
String commentUniqueID = '123456'
String inputManifest = '2.2.0/opensearch-2.2.0.yml'
String inputManifest = '2.7.0/opensearch-2.7.0.yml'

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
release-notes-check.detectDockerAgent()
detectDockerAgent.legacySCM(groovy.lang.Closure)
detectDockerAgent.library({[email protected], retriever=null})
detectDockerAgent.readYaml({file=manifests/2.2.0/opensearch-2.2.0.yml})
detectDockerAgent.readYaml({file=manifests/2.7.0/opensearch-2.7.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)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_run_ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.0/opensearch-1.3.0-test.yml"))
OPENSEARCH_TEST_MANIFEST = os.path.realpath(os.path.join(os.path.dirname(__file__), "../manifests/1.3.8/opensearch-1.3.8-test.yml"))

@patch("argparse._sys.argv", ["run_ci.py", OPENSEARCH_TEST_MANIFEST])
@patch("logging.info")
Expand Down
4 changes: 2 additions & 2 deletions tests/tests_manifests_workflow/test_input_manifests.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,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.0", "opensearch-1.3.0.yml")) in files)
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.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.3", "opensearch-dashboards-1.3.3.yml")) in files)
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.legacy_manifests_path(), os.path.join("1.2.1", "opensearch-dashboards-1.2.1.yml")) in files)

def test_create_manifest_opensearch(self) -> None:
Expand Down