From dad288e3c57c823b48a5933a6da77c7a1e82c773 Mon Sep 17 00:00:00 2001 From: venkataanil Date: Mon, 14 Nov 2022 16:33:40 +0530 Subject: [PATCH] ocm: append '\' before shell command output OCM CI failing with the errors described in https://github.com/cloud-bulldozer/airflow-kubernetes/issues/268 Recently PR #255 introduced some code for identifying last active AWS key which is causing errors in CI run. Inside run_ocm_benchmark.sh, the script ssh into ocm CI jumphost and execute this code. So we need to add additional '\' before parsing/using command output. --- dags/nocp/scripts/run_ocm_benchmark.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dags/nocp/scripts/run_ocm_benchmark.sh b/dags/nocp/scripts/run_ocm_benchmark.sh index ae81197b2..e93c4495a 100755 --- a/dags/nocp/scripts/run_ocm_benchmark.sh +++ b/dags/nocp/scripts/run_ocm_benchmark.sh @@ -39,10 +39,10 @@ run_ocm_benchmark(){ rm -rf /tmp/environment_new.txt vars.sh echo "Clean-up existing OSD access keys.." - AWS_KEY=$(aws iam list-access-keys --user-name OsdCcsAdmin --output text --query 'AccessKeyMetadata[*].AccessKeyId') - LEN_AWS_KEY=`echo $AWS_KEY | wc -w` - if [[ ${LEN_AWS_KEY} -eq 2 ]]; then - aws iam delete-access-key --user-name OsdCcsAdmin --access-key-id `printf ${AWS_KEY[0]}` + AWS_KEY=\$(/usr/bin/aws iam list-access-keys --user-name OsdCcsAdmin --output text --query 'AccessKeyMetadata[*].AccessKeyId') + LEN_AWS_KEY=\$(echo \$AWS_KEY | wc -w) + if [[ \${LEN_AWS_KEY} -eq 2 ]]; then + /usr/bin/aws iam delete-access-key --user-name OsdCcsAdmin --access-key-id \$(printf \${AWS_KEY[0]}) fi echo "Creating aws key with admin user for OCM testing" admin_key=\$(/usr/bin/aws iam create-access-key --user-name OsdCcsAdmin --output json)