Reverting "Adding instance fixture so that it can be used by architecture fixture when creating the cluster config file" (#5763)

Testing Rocky8 with default x86 architecture

Co-authored-by: Himani Deshpande <himanidp@amazon.com>

Author: himani2411

tests/integration-tests/configs/common/not_released_osses.yaml

@@ -15,15 +15,15 @@ cloudwatch_logging:
       # 2) run the test for all OSes with slurm
       - regions: ["ap-east-1"]
         instances: {{ common.INSTANCES_DEFAULT_ARM }}
-        oss: ["ubuntu2204"]
         schedulers: ["slurm"]
-      - regions: [ "ap-east-1" ]
-        instances: {{ common.INSTANCES_DEFAULT_ARM }}
-        oss: {{ common.NOT_RELEASED_OSES }}
-        schedulers: [ "slurm" ]
+        oss: ["ubuntu2204", "rhel8"]
       - regions: ["ap-east-1"]
         instances: {{ common.INSTANCES_DEFAULT_X86 }}
-        oss: ["rhel8", "centos7"]
+        oss: ["centos7"]
+        schedulers: ["slurm"]
+      - regions: ["ap-east-1"]
+        instances: {{ common.INSTANCES_DEFAULT_X86 }}
+        oss: {{ common.NOT_RELEASED_OSES }}
         schedulers: ["slurm"]
   test_compute_console_output_logging.py::test_console_output_with_monitoring_disabled:
     dimensions:

tests/integration-tests/conftest.py

@@ -565,7 +565,7 @@ def test_datadir(request, datadir):
 
 
 @pytest.fixture()
-def pcluster_config_reader(test_datadir, vpc_stack, request, region, architecture):
+def pcluster_config_reader(test_datadir, vpc_stack, request, region):
     """
     Define a fixture to render pcluster config templates associated to the running test.
 
@@ -592,7 +592,7 @@ def _config_renderer(config_file="pcluster.config.yaml", benchmarks=None, output
         rendered_template = env.get_template(config_file).render(**{**default_values, **kwargs})
         output_file_path.write_text(rendered_template)
         if not config_file.endswith("image.config.yaml"):
-            inject_additional_config_settings(output_file_path, request, region, architecture, benchmarks)
+            inject_additional_config_settings(output_file_path, request, region, benchmarks)
         else:
             inject_additional_image_configs_settings(output_file_path, request)
         return output_file_path
@@ -659,7 +659,7 @@ def _inject_additional_iam_policies_for_nodes(
             _inject_additional_iam_policies(pool, policies)
 
 
-def inject_additional_config_settings(cluster_config, request, region, architecture=None, benchmarks=None):  # noqa C901
+def inject_additional_config_settings(cluster_config, request, region, benchmarks=None):  # noqa C901
     with open(cluster_config, encoding="utf-8") as conf_file:
         config_content = yaml.safe_load(conf_file)
 
@@ -694,7 +694,6 @@ def inject_additional_config_settings(cluster_config, request, region, architect
             retrieve_latest_ami(
                 region,
                 config_content["Image"]["Os"],
-                architecture=architecture,
                 ami_type="pcluster",
             ),
             ("Image", "CustomAmi"),

tests/integration-tests/tests/update/test_update.py

@@ -1440,7 +1440,7 @@ def _test_shared_storage_rollback(
             boto3.client("fsx", region).describe_file_systems(FileSystemIds=managed_fsx)
 
 
-@pytest.mark.usefixtures("os", "instance")
+@pytest.mark.usefixtures("os")
 def test_multi_az_create_and_update(
     region, pcluster_config_reader, clusters_factory, odcr_stack, scheduler_commands_factory, test_datadir
 ):