fix rosa deployment

related to jira ticket: RHOAIENG-2683

Signed-off-by: Kobi Hakimi <[email protected]>

ods_ci/libs/Helpers.py

@@ -63,7 +63,7 @@ def get_cluster_name(self, cluster_identifier):
         ocm_client = OpenshiftClusterManager()
         # to manipulate ocm_describe on line 45
         ocm_client.cluster_name = cluster_identifier
-        cluster_name = ocm_client.ocm_describe(filter="--json | jq -r '.name'")
+        cluster_name = ocm_client.ocm_describe(jq_filter="--json | jq -r '.name'")
         cluster_name = cluster_name.strip("\n")
         return cluster_name
 

ods_ci/utils/scripts/awsOps.py

@@ -1,42 +1,23 @@
-from logging import log
 from time import sleep
 
+from logger import log
 from util import execute_command
 
 
-def aws_configure(aws_access_key_id, aws_secret_access_key, aws_region):
-    """
-    Runs aws configure and set the configuration required
-    for OpenShift/ROSA Installation
-    """
-    cmd_aws_configure_key_id = [
-        "aws",
-        "configure",
-        "set",
-        "default.aws_access_key_id",
-        aws_access_key_id,
-    ]
-    ret = execute_command(" ".join(cmd_aws_configure_key_id))
+def aws_configure_execute_cmd(aws_key, aws_value, aws_profile):
+    aws_configure_cmd = ["aws", "configure", "set", aws_key, aws_value, "--profile", aws_profile]
+    ret = execute_command(" ".join(aws_configure_cmd))
     if ret is None:
-        print("Failed  to configure aws_access_key_id")
+        log.error(f"Failed to configure {aws_key}")
         return ret
     sleep(1)
 
-    cmd_aws_configure_access_id = [
-        "aws",
-        "configure",
-        "set",
-        "default.aws_secret_access_key",
-        aws_secret_access_key,
-    ]
-    ret = execute_command(" ".join(cmd_aws_configure_access_id))
-    if ret is None:
-        print("Failed  to configure aws_secret_access_key")
-        return ret
-    sleep(1)
 
-    cmd_aws_configure_region = ["aws", "configure", "set", "default.region", aws_region]
-    ret = execute_command(" ".join(cmd_aws_configure_region))
-    if ret is None:
-        print("Failed  to configure region")
-        return ret
+def aws_configure(aws_access_key_id, aws_secret_access_key, aws_region, aws_profile="default"):
+    """
+    Runs aws configure and set the configuration required
+    for OpenShift/ROSA Installation
+    """
+    aws_configure_execute_cmd(aws_key="aws_access_key_id", aws_value=aws_access_key_id, aws_profile=aws_profile)
+    aws_configure_execute_cmd(aws_key="aws_secret_access_key", aws_value=aws_secret_access_key, aws_profile=aws_profile)
+    aws_configure_execute_cmd(aws_key="region", aws_value=aws_region, aws_profile=aws_profile)