From 97fc84ef17c376efb70e04ea00c470aefb8afa9d Mon Sep 17 00:00:00 2001 From: pokeeffe-molecula Date: Tue, 4 Jan 2022 19:31:18 -0600 Subject: [PATCH] fixed filenames for output --- qa/scripts/setupSmokeTest.sh | 6 +++--- qa/scripts/testSmokeTest.sh | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qa/scripts/setupSmokeTest.sh b/qa/scripts/setupSmokeTest.sh index 853d4caf6..085b0fff3 100755 --- a/qa/scripts/setupSmokeTest.sh +++ b/qa/scripts/setupSmokeTest.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/ci/smoketest/smoketest.json | jq -r '[.ingest_ips][0]["value"][0]') +BASTION=$(cat ./qa/tf/ci/smoketest/outputs.json | jq -r '[.ingest_ips][0]["value"][0]') echo "using bastion ${BASTION}" -NODE=$(cat ./qa/tf/ci/smoketest/smoketest.json | jq -r '[.data_node_ips][0]["value"][0]') +NODE=$(cat ./qa/tf/ci/smoketest/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/testSmokeTest.sh b/qa/scripts/testSmokeTest.sh index 3d1f615f0..2d6b5892b 100755 --- a/qa/scripts/testSmokeTest.sh +++ b/qa/scripts/testSmokeTest.sh @@ -1,10 +1,12 @@ #!/bin/bash # get the bastion host -BASTION=$(cat ./qa/tf/ci/smoketest/smoketest.json | jq -r '[.ingest_ips][0]["value"][0]') +BASTION=$(cat ./qa/tf/ci/smoketest/outputs.json | jq -r '[.ingest_ips][0]["value"][0]') echo "using bastion ${BASTION}" -NODE=$(cat ./qa/tf/ci/smoketest/smoketest.json | jq -r '[.data_node_ips][0]["value"][0]') +NODE=$(cat ./qa/tf/ci/smoketest/outputs.json | jq -r '[.data_node_ips][0]["value"][0]') echo "using node ${NODE}" + + echo "Smoke test complete" \ No newline at end of file