diff --git a/scripts/default/integtest.sh b/scripts/default/integtest.sh index eb12e34a0d..7a600d4cf8 100755 --- a/scripts/default/integtest.sh +++ b/scripts/default/integtest.sh @@ -87,9 +87,16 @@ then SNAPSHOT="false" fi +OPENSEARCH_REQUIRED_VERSION="2.12.0" if [ -z "$CREDENTIAL" ] then - CREDENTIAL="admin:admin" + # Starting in 2.12.0, security demo configuration script requires an initial admin password + COMPARE_VERSION=`echo $OPENSEARCH_REQUIRED_VERSION $OPENSEARCH_VERSION | tr ' ' '\n' | sort -V | uniq | head -n 1` + if [ "$COMPARE_VERSION" != "$OPENSEARCH_REQUIRED_VERSION" ]; then + CREDENTIAL="admin:admin" + else + CREDENTIAL="admin:myStrongPassword123!" + fi fi USERNAME=`echo $CREDENTIAL | awk -F ':' '{print $1}'` diff --git a/src/test_workflow/integ_test/distribution_tar.py b/src/test_workflow/integ_test/distribution_tar.py index d3317d1263..4c8ed65336 100644 --- a/src/test_workflow/integ_test/distribution_tar.py +++ b/src/test_workflow/integ_test/distribution_tar.py @@ -33,7 +33,7 @@ def install(self, bundle_name: str) -> None: @property def start_cmd(self) -> str: start_cmd_map = { - "opensearch": "./opensearch-tar-install.sh", + "opensearch": "export OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123! && ./opensearch-tar-install.sh", "opensearch-dashboards": "./opensearch-dashboards", } return start_cmd_map[self.filename] diff --git a/src/test_workflow/integ_test/distribution_zip.py b/src/test_workflow/integ_test/distribution_zip.py index ad3c2c09ba..9dcb80b355 100644 --- a/src/test_workflow/integ_test/distribution_zip.py +++ b/src/test_workflow/integ_test/distribution_zip.py @@ -33,7 +33,7 @@ def install(self, bundle_name: str) -> None: @property def start_cmd(self) -> str: start_cmd_map = { - "opensearch": ".\\opensearch-windows-install.bat", + "opensearch": "set OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123! .\\opensearch-windows-install.bat", "opensearch-dashboards": ".\\opensearch-dashboards.bat", } return start_cmd_map[self.filename] diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_tar.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_tar.py index 488ccf8d88..0b52fdc65a 100644 --- a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_tar.py +++ b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_tar.py @@ -45,7 +45,7 @@ def test_install(self) -> None: mock_tarfile_extractall.assert_called_with(self.work_dir) def test_start_cmd(self) -> None: - self.assertEqual(self.distribution_tar.start_cmd, "./opensearch-tar-install.sh") + self.assertEqual(self.distribution_tar.start_cmd, "export OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123! && ./opensearch-tar-install.sh") self.assertEqual(self.distribution_tar_dashboards.start_cmd, "./opensearch-dashboards") @patch("subprocess.check_call") diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_zip.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_zip.py index fbd5b53695..b4113939e5 100644 --- a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_zip.py +++ b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_distribution_zip.py @@ -47,7 +47,7 @@ def test_install(self) -> None: mock_zipfile_extractall.assert_called_with(self.work_dir) def test_start_cmd(self) -> None: - self.assertEqual(self.distribution_zip.start_cmd, ".\\opensearch-windows-install.bat") + self.assertEqual(self.distribution_zip.start_cmd, "set OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123! .\\opensearch-windows-install.bat") @patch("subprocess.check_call") def test_uninstall(self, check_call_mock: Mock) -> None: diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_service_opensearch.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_service_opensearch.py index 0b8cf02621..b17a379b4f 100644 --- a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_service_opensearch.py +++ b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_service_opensearch.py @@ -62,7 +62,7 @@ def test_start(self, mock_tarfile_open: Mock, mock_dump: Mock, mock_file: Mock, # call test target function service.start() - mock_process.assert_called_once_with("./opensearch-tar-install.sh", os.path.join(self.work_dir, "opensearch-1.1.0"), False) + mock_process.assert_called_once_with("export OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123! && ./opensearch-tar-install.sh", os.path.join(self.work_dir, "opensearch-1.1.0"), False) mock_dump.assert_called_once_with(self.additional_config)