Added architecture to fetch_remote_setup_from_config

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.23"
+version = "0.11.24"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"

redisbench_admin/run_remote/remote_db.py

@@ -103,6 +103,7 @@ def remote_db_spin(
     flushall_on_every_test_start=False,
     ignore_keyspace_errors=False,
     continue_on_module_check_error=False,
+    keyspace_check_timeout=60,
 ):
     (
         _,

redisbench_admin/run_remote/remote_env.py

@@ -40,6 +40,7 @@ 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}"
@@ -51,6 +52,9 @@ def remote_env_setup(
             logging.info(f"'-{ARCH_ARM}' suffix already in {tf_folder_path}")
 
     if args.inventory is not None:
+        logging.info(
+            f"inventory info passed. avoiding to deploy using terraform {args.inventory}"
+        )
         (
             status,
             client_public_ip,

redisbench_admin/run_remote/run_remote.py

@@ -307,7 +307,7 @@ def run_remote_command_logic(args, project_name, project_version):
         )
         exit(1)
     else:
-        logging.info("Running benchmark for architecture {architecture}")
+        logging.info(f"Running benchmark for architecture {architecture}")
 
     # contains the overall target-tables ( if any target is defined )
     overall_tables = {}

redisbench_admin/run_remote/terraform.py

@@ -30,6 +30,7 @@ def terraform_spin_or_reuse_env(
     tf_timeout_secs=7200,
     tf_override_name=None,
     tf_folder_path=None,
+    architecture="x86_64",
 ):
     (
         remote_setup,
@@ -40,6 +41,7 @@ def terraform_spin_or_reuse_env(
         "https://github.com/redis-performance/testing-infrastructure.git",
         "master",
         tf_folder_path,
+        architecture,
     )
     logging.info(
         "Repetition {} of {}. Deploying test {} on AWS using {}".format(

redisbench_admin/utils/remote.py

@@ -579,6 +579,7 @@ def fetch_remote_setup_from_config(
     repo="https://github.com/redis-performance/testing-infrastructure.git",
     branch="master",
     path=None,
+    architecture=ARCH_X86,
 ):
     setup_type = "oss-standalone"
     setup = None
@@ -590,7 +591,17 @@ def fetch_remote_setup_from_config(
                 setup = remote_setup_property["setup"]
         # fetch terraform folder
         path = "/terraform/{}-{}".format(setup_type, setup)
+    if architecture != ARCH_X86:
+        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:
+            logging.info(f"adding suffix '-{ARCH_ARM}' to {path}")
+            path = f"{path}-{ARCH_ARM}"
+        else:
+            logging.info(f"'-{ARCH_ARM}' suffix already in {path}")
     terraform_working_dir = common_tf(branch, path, repo)
+
     return terraform_working_dir, setup_type, setup
 
 

tests/test_remote.py

@@ -106,6 +106,22 @@ def test_fetch_remote_setup_from_config():
     assert type == "oss-standalone"
 
 
+def test_fetch_remote_setup_from_config_aarch64():
+    architecture = "aarch64"
+    path = None
+    branch = "master"
+    repo = "https://github.com/redis-performance/testing-infrastructure.git"
+    terraform_working_dir, type, _ = fetch_remote_setup_from_config(
+        [{"type": "oss-standalone"}, {"setup": "redisearch-m5"}],
+        repo,
+        branch,
+        path,
+        architecture,
+    )
+    assert type == "oss-standalone"
+    assert terraform_working_dir.endswith("/oss-standalone-redisearch-m5-aarch64")
+
+
 def test_push_data_to_redistimeseries():
     time_series_dict = {}
     try: