Skip to content

Commit 60a48d2

Browse files
gaiksayagaiksaya
committed
Revert "Automate adding manifest to integTest notification cron (#5098)"
Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
1 parent 7cb0fc3 commit 60a48d2

5 files changed

+4
-67
lines changed

‎jenkins/integ-test-notification.jenkinsfile

-11
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,6 @@ pipeline {
2626
timeout(time: 1, unit: 'HOURS')
2727
buildDiscarder(logRotator(daysToKeepStr: '30'))
2828
}
29-
triggers {
30-
parameterizedCron('''
31-
H */6 * * * %INPUT_MANIFEST=1.3.21/opensearch-1.3.21.yml
32-
H */6 * * * %INPUT_MANIFEST=2.19.0/opensearch-dashboards-2.19.0.yml
33-
H */6 * * * %INPUT_MANIFEST=2.18.1/opensearch-2.18.1.yml
34-
H */6 * * * %INPUT_MANIFEST=1.3.20/opensearch-dashboards-1.3.20.yml
35-
H */6 * * * %INPUT_MANIFEST=2.19.0/opensearch-2.19.0.yml
36-
H */6 * * * %INPUT_MANIFEST=2.18.0/opensearch-2.18.0.yml
37-
H */6 * * * %INPUT_MANIFEST=2.18.0/opensearch-dashboards-2.18.0.yml
38-
''')
39-
}
4029
parameters {
4130
string(
4231
name: 'INPUT_MANIFEST',

‎src/manifests_workflow/input_manifests.py

-23
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ def jenkins_path(self) -> str:
5151
def cron_jenkinsfile(self) -> str:
5252
return os.path.join(self.jenkins_path(), "check-for-build.jenkinsfile")
5353

54-
@classmethod
55-
def cron_integTest_notification_jenkinsfile(self) -> str:
56-
return os.path.join(self.jenkins_path(), "integ-test-notification.jenkinsfile")
57-
5854
@classmethod
5955
def os_versionincrement_workflow(self) -> str:
6056
return os.path.join(self.workflows_path(), "os-increment-plugin-versions.yml")
@@ -124,7 +120,6 @@ def update(
124120
for new_version_entry in new_versions:
125121
self.write_manifest(new_version_entry, branch_versions[new_version_entry], known_versions)
126122
self.add_to_cron(new_version_entry)
127-
self.add_to_integTest_notification_cron(new_version_entry)
128123
self.add_to_versionincrement_workflow(new_version_entry)
129124
known_versions.append(new_version_entry)
130125

@@ -217,24 +212,6 @@ def add_to_cron(self, version: str) -> None:
217212

218213
logging.info(f"Wrote {jenkinsfile}")
219214

220-
def add_to_integTest_notification_cron(self, version: str) -> None:
221-
logging.info(f"Adding new version to integ test notification cron: {version}")
222-
integTestJenkinsfile = self.cron_integTest_notification_jenkinsfile()
223-
with open(integTestJenkinsfile, "r") as f:
224-
data = f.read()
225-
226-
cron_entry = f"H */6 * * * %INPUT_MANIFEST={version}/{self.prefix}-{version}.yml\n"
227-
228-
if cron_entry in data:
229-
raise ValueError(f"{integTestJenkinsfile} already contains an entry for {self.prefix} {version}")
230-
231-
data = data.replace("parameterizedCron('''\n", f"parameterizedCron('''\n{' ' * 12}{cron_entry}")
232-
233-
with open(integTestJenkinsfile, "w") as f:
234-
f.write(data)
235-
236-
logging.info(f"Wrote {integTestJenkinsfile}")
237-
238215
def add_to_versionincrement_workflow(self, version: str) -> None:
239216
versionincrement_workflow_files = [self.os_versionincrement_workflow(), self.osd_versionincrement_workflow()]
240217
yaml = ruamel.yaml.YAML()

‎tests/tests_manifests_workflow/test_input_manifests.py

-17
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,6 @@ def test_cron_jenkinsfile(self) -> None:
213213
os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "jenkins", "check-for-build.jenkinsfile"))
214214
)
215215

216-
def test_cron_integTest_notification_jenkinsfilee(self) -> None:
217-
self.assertEqual(
218-
InputManifests.cron_integTest_notification_jenkinsfile(),
219-
os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "jenkins", "integ-test-notification.jenkinsfile"))
220-
)
221-
222216
@patch("builtins.open", new_callable=mock_open)
223217
def test_add_to_cron(self, mock_open: MagicMock) -> None:
224218
mock_open().read.return_value = "parameterizedCron '''\n"
@@ -232,17 +226,6 @@ def test_add_to_cron(self, mock_open: MagicMock) -> None:
232226
"TEST_MANIFEST=0.1.2/test-0.1.2-test.yml;TEST_PLATFORM=linux;TEST_DISTRIBUTION=tar\n"
233227
)
234228

235-
@patch("builtins.open", new_callable=mock_open)
236-
def test_add_to_integTest_notification_cron(self, mock_open: MagicMock) -> None:
237-
mock_open().read.return_value = "parameterizedCron('''\n"
238-
input_manifests = InputManifests("test")
239-
input_manifests.add_to_integTest_notification_cron('0.1.2')
240-
mock_open.assert_has_calls([call(InputManifests.cron_integTest_notification_jenkinsfile(), 'w')])
241-
mock_open.assert_has_calls([call(InputManifests.cron_integTest_notification_jenkinsfile(), 'r')])
242-
mock_open().write.assert_called_once_with(
243-
"parameterizedCron('''\n H */6 * * * %INPUT_MANIFEST=0.1.2/test-0.1.2.yml\n"
244-
)
245-
246229
def test_os_versionincrement_workflow(self) -> None:
247230
self.assertEqual(
248231
InputManifests.os_versionincrement_workflow(),

‎tests/tests_manifests_workflow/test_input_manifests_opensearch.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ def test_files(self) -> None:
3232
@patch("os.chdir")
3333
@patch("manifests_workflow.input_manifests.InputManifests.add_to_versionincrement_workflow")
3434
@patch("manifests_workflow.input_manifests.InputManifests.add_to_cron")
35-
@patch("manifests_workflow.input_manifests.InputManifests.add_to_integTest_notification_cron")
3635
@patch("manifests.manifest.Manifest.to_file")
3736
@patch("manifests_workflow.input_manifests_opensearch.ComponentOpenSearchMin")
38-
def test_update(self, mock_component_opensearch_min: MagicMock, mock_manifest_to_file: MagicMock, mock_add_to_integTest_notification_cron: MagicMock,
37+
def test_update(self, mock_component_opensearch_min: MagicMock, mock_manifest_to_file: MagicMock,
3938
mock_add_to_cron: MagicMock, mock_add_to_versionincrement_workflow: MagicMock,
4039
*mocks: MagicMock) -> None:
4140
mock_component_opensearch_min.return_value = MagicMock(name="OpenSearch")
@@ -54,9 +53,6 @@ def test_update(self, mock_component_opensearch_min: MagicMock, mock_manifest_to
5453
)
5554
]
5655
mock_manifest_to_file.assert_has_calls(calls)
57-
mock_add_to_integTest_notification_cron.assert_has_calls([
58-
call('2.1000.1000'),
59-
])
6056
mock_add_to_cron.assert_has_calls([
6157
call('2.1000.1000'),
6258
])
@@ -66,10 +62,9 @@ def test_update(self, mock_component_opensearch_min: MagicMock, mock_manifest_to
6662

6763
@patch("manifests_workflow.input_manifests.InputManifests.add_to_versionincrement_workflow")
6864
@patch("manifests_workflow.input_manifests.InputManifests.add_to_cron")
69-
@patch("manifests_workflow.input_manifests.InputManifests.add_to_integTest_notification_cron")
7065
@patch("manifests.manifest.Manifest.to_file")
7166
@patch("manifests_workflow.input_manifests_opensearch.ComponentOpenSearchMin")
72-
def test_update_outdated_branch(self, mock_component_opensearch_min: MagicMock, mock_manifest_to_file: MagicMock, mock_add_to_integTest_notification_cron: MagicMock,
67+
def test_update_outdated_branch(self, mock_component_opensearch_min: MagicMock, mock_manifest_to_file: MagicMock,
7368
mock_add_to_cron: MagicMock, mock_add_to_versionincrement_workflow: MagicMock) -> None:
7469
mock_component_opensearch_min.return_value = MagicMock(name="OpenSearch")
7570
mock_component_opensearch_min.branches.return_value = ["1.2"]
@@ -78,5 +73,4 @@ def test_update_outdated_branch(self, mock_component_opensearch_min: MagicMock,
7873
manifests.update()
7974
self.assertEqual(mock_manifest_to_file.call_count, 0)
8075
self.assertEqual(mock_add_to_cron.call_count, 0)
81-
self.assertEqual(mock_add_to_integTest_notification_cron.call_count, 0)
8276
self.assertEqual(mock_add_to_versionincrement_workflow.call_count, 0)

‎tests/tests_manifests_workflow/test_input_manifests_opensearch_dashboards.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ def test_files(self) -> None:
3232
@patch("os.chdir")
3333
@patch("manifests_workflow.input_manifests.InputManifests.add_to_versionincrement_workflow")
3434
@patch("manifests_workflow.input_manifests.InputManifests.add_to_cron")
35-
@patch("manifests_workflow.input_manifests.InputManifests.add_to_integTest_notification_cron")
3635
@patch("manifests.manifest.Manifest.to_file")
3736
@patch("manifests_workflow.input_manifests_opensearch_dashboards.ComponentOpenSearchDashboardsMin")
38-
def test_update(self, mock_component_opensearch_dashboards_min: MagicMock, mock_manifest_to_file: MagicMock, mock_add_to_integTest_notification_cron: MagicMock,
37+
def test_update(self, mock_component_opensearch_dashboards_min: MagicMock, mock_manifest_to_file: MagicMock,
3938
mock_add_to_cron: MagicMock, mock_add_to_versionincrement_workflow: MagicMock,
4039
mock_os_chdir: MagicMock, mock_os_makedirs: MagicMock) -> None:
4140
mock_component_opensearch_dashboards_min.return_value = MagicMock(name="OpenSearch-Dashboards")
@@ -58,19 +57,15 @@ def test_update(self, mock_component_opensearch_dashboards_min: MagicMock, mock_
5857
mock_add_to_cron.assert_has_calls([
5958
call('2.1000.1000')
6059
])
61-
mock_add_to_integTest_notification_cron.assert_has_calls([
62-
call('2.1000.1000')
63-
])
6460
mock_add_to_versionincrement_workflow.assert_has_calls([
6561
call('2.1000.1000')
6662
])
6763

6864
@patch("manifests_workflow.input_manifests.InputManifests.add_to_versionincrement_workflow")
6965
@patch("manifests_workflow.input_manifests.InputManifests.add_to_cron")
70-
@patch("manifests_workflow.input_manifests.InputManifests.add_to_integTest_notification_cron")
7166
@patch("manifests.manifest.Manifest.to_file")
7267
@patch("manifests_workflow.input_manifests_opensearch_dashboards.ComponentOpenSearchDashboardsMin")
73-
def test_update_outdated_branch(self, mock_component_opensearch_dashboards_min: MagicMock, mock_manifest_to_file: MagicMock, mock_add_to_integTest_notification_cron: MagicMock,
68+
def test_update_outdated_branch(self, mock_component_opensearch_dashboards_min: MagicMock, mock_manifest_to_file: MagicMock,
7469
mock_add_to_cron: MagicMock, mock_add_to_versionincrement_workflow: MagicMock) -> None:
7570
mock_component_opensearch_dashboards_min.return_value = MagicMock(name="OpenSearch-Dashboards")
7671
mock_component_opensearch_dashboards_min.branches.return_value = ["1.2"]
@@ -80,5 +75,4 @@ def test_update_outdated_branch(self, mock_component_opensearch_dashboards_min:
8075
manifests.update()
8176
self.assertEqual(mock_manifest_to_file.call_count, 0)
8277
self.assertEqual(mock_add_to_cron.call_count, 0)
83-
self.assertEqual(mock_add_to_integTest_notification_cron.call_count, 0)
8478
self.assertEqual(mock_add_to_versionincrement_workflow.call_count, 0)

0 commit comments

Comments
 (0)