Ensuring architecture checks are effective

Author: filipecosta90

redisbench_admin/run_remote/remote_env.py

@@ -40,17 +40,8 @@ def remote_env_setup(
     db_ssh_port = args.db_ssh_port
     client_ssh_port = args.client_ssh_port
     username = args.user
-    logging.info(f"specified arch for deployment {architecture}")
-    if architecture != ARCH_X86 and tf_folder_path is not None:
-        logging.info(
-            f"Checking if the architecture info is specified on the terraform path {tf_folder_path}"
-        )
-        if architecture is ARCH_ARM and ARCH_ARM not in tf_folder_path:
-            logging.info(f"adding suffix '-{ARCH_ARM}' to {tf_folder_path}")
-            tf_folder_path = "{tf_folder_path}-{ARCH_ARM}"
-        else:
-            logging.info(f"'-{ARCH_ARM}' suffix already in {tf_folder_path}")
 
+    logging.info(f"specified arch for deployment {architecture}")
     if args.inventory is not None:
         logging.info(
             f"inventory info passed. avoiding to deploy using terraform {args.inventory}"
@@ -101,6 +92,7 @@ def remote_env_setup(
                         tf_timeout_secs,
                         tf_override_name,
                         tf_folder_spot_path,
+                        architecture,
                     )
                     spot_available_and_used = True
                     spot_price_counter = spot_price_counter + 1
@@ -117,6 +109,9 @@ def remote_env_setup(
                     "Even though there is a spot instance config, avoiding deploying it."
                 )
         if spot_available_and_used is False:
+            import pdb
+
+            pdb.set_trace()
             (
                 client_public_ip,
                 _,
@@ -139,6 +134,7 @@ def remote_env_setup(
                 tf_timeout_secs,
                 tf_override_name,
                 tf_folder_path,
+                architecture,
             )
             full_price_counter = full_price_counter + 1
     logging.info("Using the following connection addresses.")

redisbench_admin/run_remote/terraform.py

@@ -44,9 +44,7 @@ def terraform_spin_or_reuse_env(
         architecture,
     )
     logging.info(
-        "Repetition {} of {}. Deploying test {} on AWS using {}".format(
-            repetition, BENCHMARK_REPETITIONS, test_name, remote_setup
-        )
+        f"Repetition {repetition} of {BENCHMARK_REPETITIONS}. Deploying test {test_name} on AWS using (architecture={architecture}) {remote_setup}"
     )
     if tf_override_name is None:
         tf_setup_name = "{}{}".format(remote_setup, tf_setup_name_sufix)

redisbench_admin/utils/remote.py

@@ -276,7 +276,9 @@ def setup_remote_environment(
     _, _, _ = tf.init(
         capture_output=True,
         backend_config={
-            "key": "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name)
+            "key": "benchmarks/infrastructure/{}.tfstate".format(
+                tf_setup_name.replace("/", "-")
+            )
         },
     )
     _, _, _ = tf.refresh()
@@ -582,6 +584,7 @@ def fetch_remote_setup_from_config(
     architecture=ARCH_X86,
 ):
     setup_type = "oss-standalone"
+    logging.info(f"fetch_remote_setup_from_config, architecture={architecture}")
     setup = None
     if path is None:
         for remote_setup_property in remote_setup_config:
@@ -595,7 +598,7 @@ def fetch_remote_setup_from_config(
         logging.info(
             f"Checking if the architecture info is specified on the terraform path {path}"
         )
-        if architecture is ARCH_ARM and ARCH_ARM not in path:
+        if architecture == ARCH_ARM and ARCH_ARM not in path:
             logging.info(f"adding suffix '-{ARCH_ARM}' to {path}")
             path = f"{path}-{ARCH_ARM}"
         else: