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.

Sign up for GitHub

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

Jump to bottom

Revert "Revert rpm/deb changes pending decision" #4341

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Revert "Revert rpm/deb changes pending decision" #4341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25e6bdc
Revert "Revert rpm/deb changes pending decision"
derek-ho Jan 8, 2024
4cbe3f3
Replace export with sudo env, similar to recommended and tested insta…
derek-ho Jan 12, 2024
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
4 changes: 4 additions & 0 deletions src/test_workflow/integ_test/distribution_deb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ def install(self, bundle_name: str) -> None:
logging.info("deb installation requires sudo, script will exit if current user does not have sudo access")
deb_install_cmd = " ".join(
[
'sudo',
'env',
'OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!',
'&&',
'sudo',
'dpkg',
'--purge',
Expand Down
4 changes: 4 additions & 0 deletions src/test_workflow/integ_test/distribution_rpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ def install(self, bundle_name: str) -> None:
logging.info("rpm installation requires sudo, script will exit if current user does not have sudo access")
rpm_install_cmd = " ".join(
[
'sudo',
'env',
'OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!',
'&&',
'sudo',
'yum',
'remove',
Expand Down
16 changes: 11 additions & 5 deletions tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_deb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@


class TestDistributionDeb(unittest.TestCase):

def setUp(self) -> None:

self.work_dir = os.path.join(os.path.dirname(__file__), "data")
self.distribution_deb = DistributionDeb("opensearch", "1.3.0", self.work_dir)
self.distribution_deb_dashboards = DistributionDeb("opensearch-dashboards", "1.3.0", self.work_dir)

def test_distribution_deb_vars(self) -> None:
self.assertEqual(self.distribution_deb.filename, 'opensearch')
self.assertEqual(self.distribution_deb.version, '1.3.0')
self.assertEqual(self.distribution_deb.filename, "opensearch")
self.assertEqual(self.distribution_deb.version, "1.3.0")
self.assertEqual(self.distribution_deb.work_dir, self.work_dir)
self.assertEqual(self.distribution_deb.require_sudo, True)

Expand All @@ -40,7 +38,15 @@ def test_install(self, check_call_mock: Mock) -> None:
args_list = check_call_mock.call_args_list

self.assertEqual(check_call_mock.call_count, 1)
self.assertEqual(f"sudo dpkg --purge opensearch && sudo dpkg --install opensearch.deb && sudo chmod 0666 {self.distribution_deb.config_path}", args_list[0][0][0])
self.assertEqual(
(
"sudo env OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123! && "
"sudo dpkg --purge opensearch && "
"sudo dpkg --install opensearch.deb && "
f"sudo chmod 0666 {self.distribution_deb.config_path}"
),
args_list[0][0][0],
)

def test_start_cmd(self) -> None:
self.assertEqual(self.distribution_deb.start_cmd, "sudo systemctl start opensearch")
Expand Down
16 changes: 11 additions & 5 deletions tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_rpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@


class TestDistributionRpm(unittest.TestCase):

def setUp(self) -> None:

self.work_dir = os.path.join(os.path.dirname(__file__), "data")
self.distribution_rpm = DistributionRpm("opensearch", "1.3.0", self.work_dir)
self.distribution_rpm_dashboards = DistributionRpm("opensearch-dashboards", "1.3.0", self.work_dir)

def test_distribution_rpm_vars(self) -> None:
self.assertEqual(self.distribution_rpm.filename, 'opensearch')
self.assertEqual(self.distribution_rpm.version, '1.3.0')
self.assertEqual(self.distribution_rpm.filename, "opensearch")
self.assertEqual(self.distribution_rpm.version, "1.3.0")
self.assertEqual(self.distribution_rpm.work_dir, self.work_dir)
self.assertEqual(self.distribution_rpm.require_sudo, True)

Expand All @@ -40,7 +38,15 @@ def test_install(self, check_call_mock: Mock) -> None:
args_list = check_call_mock.call_args_list

self.assertEqual(check_call_mock.call_count, 1)
self.assertEqual(f"sudo yum remove -y opensearch && sudo yum install -y opensearch.rpm && sudo chmod 0666 {self.distribution_rpm.config_path}", args_list[0][0][0])
self.assertEqual(
(
"sudo env OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123! && "
"sudo yum remove -y opensearch && "
"sudo yum install -y opensearch.rpm && "
f"sudo chmod 0666 {self.distribution_rpm.config_path}"
),
args_list[0][0][0],
)

def test_start_cmd(self) -> None:
self.assertEqual(self.distribution_rpm.start_cmd, "sudo systemctl start opensearch")
Expand Down
Loading