diff --git a/Makefile b/Makefile index 9c3b62f09cb..bc5c91dded3 100644 --- a/Makefile +++ b/Makefile @@ -284,6 +284,9 @@ deploy_nodes_with_install: start_load_balancer deploy_nodes: start_load_balancer TEST_TEARDOWN=no TEST=./src/tests/test_targets.py TEST_FUNC=test_target_deploy_nodes $(MAKE) test +deploy_nodes_oci: start_load_balancer + TEST_TEARDOWN=no TEST=./src/tests/test_targets.py TEST_FUNC=test_target_deploy_nodes_oci $(MAKE) test + deploy_nodes_with_networking: start_load_balancer TEST_TEARDOWN=no TEST=./src/tests/test_targets.py TEST_FUNC=test_target_deploy_networking_with_nodes $(MAKE) test diff --git a/src/assisted_test_infra/test_infra/controllers/node_controllers/oci_api_controller.py b/src/assisted_test_infra/test_infra/controllers/node_controllers/oci_api_controller.py index 96d0e868b39..547ac16f01d 100644 --- a/src/assisted_test_infra/test_infra/controllers/node_controllers/oci_api_controller.py +++ b/src/assisted_test_infra/test_infra/controllers/node_controllers/oci_api_controller.py @@ -456,7 +456,7 @@ def prepare_nodes(self) -> None: namespace = self._create_bucket(bucket_name) self._upload_file_to_bucket(self._entity_config.iso_download_path, namespace, bucket_name) url_path = self._create_pre_authenticated( - f"preauth-{self._entity_config.cluster_id}", self._entity_config.iso_download_path, namespace, bucket_name + f"preauth-{self._entity_config.cluster_id}", self._entity_config.iso_download_path, namespace, bucket_name ) terraform_variables = self._terraform_variables( @@ -474,7 +474,7 @@ def prepare_nodes(self) -> None: self._config.oci_infrastructure_zip_file, terraform_variables, ) - terraform_output = self._apply_job_from_stack(stack_id, random_name("job-")) + terraform_output = self._apply_job_from_stack(stack_id, f"apply-job-{self._entity_config.cluster_id}") self._upload_data_to_bucket( terraform_output, f"terraform-output-{self._entity_config.cluster_id}.yaml", namespace, bucket_name ) diff --git a/src/tests/test_targets.py b/src/tests/test_targets.py index 87921ebe8d4..5a8e78c142b 100644 --- a/src/tests/test_targets.py +++ b/src/tests/test_targets.py @@ -21,6 +21,11 @@ class TestMakefileTargets(BaseTest): def test_target_deploy_nodes(self, cluster): cluster.prepare_nodes() + @JunitTestSuite() + def test_target_deploy_nodes_oci(self, cluster): + cluster.generate_and_download_infra_env() + cluster.nodes.prepare_nodes() + @JunitTestSuite() def test_target_deploy_networking_with_nodes(self, cluster): cluster.prepare_for_installation()