From 1fccfabc8f4a8838e31b2278761830df78b6dc13 Mon Sep 17 00:00:00 2001 From: pokeeffe-molecula Date: Wed, 5 Jan 2022 15:35:38 -0600 Subject: [PATCH] changes based on feedback --- .gitignore | 1 + qa/scripts/setupSamsungGauntlet.sh | 6 ++-- qa/scripts/testSamsungGauntlet.sh | 4 +-- qa/scripts/testSmokeTest.sh | 2 +- qa/tf/ci/smoketest/outputs.json | 26 ----------------- qa/tf/gauntlet/samsung/samsung-gauntlet.json | 30 -------------------- 6 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 qa/tf/ci/smoketest/outputs.json delete mode 100644 qa/tf/gauntlet/samsung/samsung-gauntlet.json diff --git a/.gitignore b/.gitignore index 15cd5096c..6758e781b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ launch.json .terraform.lock.hcl __pycache__/ report.xml +outputs.json diff --git a/qa/scripts/setupSamsungGauntlet.sh b/qa/scripts/setupSamsungGauntlet.sh index 6a867c18d..1c741be78 100755 --- a/qa/scripts/setupSamsungGauntlet.sh +++ b/qa/scripts/setupSamsungGauntlet.sh @@ -9,14 +9,14 @@ echo "Running terraform init..." terraform init -input=false echo "Running terraform apply..." terraform apply -input=false -auto-approve -terraform output -json > samsung-gauntlet.json +terraform output -json > outputs.json popd # get the bastion host -BASTION=$(cat ./qa/tf/gauntlet/samsung/samsung-gauntlet.json | jq -r '[.ingest_ips][0]["value"][0]') +BASTION=$(cat ./qa/tf/gauntlet/samsung/outputs.json | jq -r '[.ingest_ips][0]["value"][0]') echo "using bastion ${BASTION}" -NODE=$(cat ./qa/tf/gauntlet/samsung/samsung-gauntlet.json | jq -r '[.data_node_ips][0]["value"][0]') +NODE=$(cat ./qa/tf/gauntlet/samsung/outputs.json | jq -r '[.data_node_ips][0]["value"][0]') echo "using node ${NODE}" # remember that the nodes will take at least 2 mins to be up and going and finish cloud-init diff --git a/qa/scripts/testSamsungGauntlet.sh b/qa/scripts/testSamsungGauntlet.sh index ff8d13cb7..efe0b8951 100755 --- a/qa/scripts/testSamsungGauntlet.sh +++ b/qa/scripts/testSamsungGauntlet.sh @@ -1,10 +1,10 @@ #!/bin/bash # get the bastion host -BASTION=$(cat ./qa/tf/gauntlet/samsung/samsung-gauntlet.json | jq -r '[.ingest_ips][0]["value"][0]') +BASTION=$(cat ./qa/tf/gauntlet/samsung/outputs.json | jq -r '[.ingest_ips][0]["value"][0]') echo "using bastion ${BASTION}" -NODE=$(cat ./qa/tf/gauntlet/samsung/samsung-gauntlet.json | jq -r '[.data_node_ips][0]["value"][0]') +NODE=$(cat ./qa/tf/gauntlet/samsung/outputs.json | jq -r '[.data_node_ips][0]["value"][0]') echo "using node ${NODE}" # generate csv files diff --git a/qa/scripts/testSmokeTest.sh b/qa/scripts/testSmokeTest.sh index 069ab7c81..ed748cf97 100755 --- a/qa/scripts/testSmokeTest.sh +++ b/qa/scripts/testSmokeTest.sh @@ -20,7 +20,7 @@ echo "Running smoke test..." ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${BASTION} " pushd /data; pytest --junitxml=report.xml; popd" if (( $? != 0 )) then - echo "Unable to run smoketest" + echo "Unable to run smoke test" exit 1 fi diff --git a/qa/tf/ci/smoketest/outputs.json b/qa/tf/ci/smoketest/outputs.json deleted file mode 100644 index ce0a71cf8..000000000 --- a/qa/tf/ci/smoketest/outputs.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "data_node_ips": { - "sensitive": false, - "type": [ - "tuple", - [ - "string" - ] - ], - "value": [ - "10.0.1.152" - ] - }, - "ingest_ips": { - "sensitive": false, - "type": [ - "tuple", - [ - "string" - ] - ], - "value": [ - "3.128.203.136" - ] - } -} diff --git a/qa/tf/gauntlet/samsung/samsung-gauntlet.json b/qa/tf/gauntlet/samsung/samsung-gauntlet.json deleted file mode 100644 index 8760c7322..000000000 --- a/qa/tf/gauntlet/samsung/samsung-gauntlet.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "data_node_ips": { - "sensitive": false, - "type": [ - "tuple", - [ - "string", - "string", - "string" - ] - ], - "value": [ - "10.0.1.144", - "10.0.2.108", - "10.0.3.178" - ] - }, - "ingest_ips": { - "sensitive": false, - "type": [ - "tuple", - [ - "string" - ] - ], - "value": [ - "3.145.104.76" - ] - } -}