From ffed9531fc81a92f3604ac28f2ac8acc3da1dedb Mon Sep 17 00:00:00 2001 From: souhailanoor <90720110+souhailanoor@users.noreply.github.com> Date: Fri, 6 May 2022 12:00:04 -0500 Subject: [PATCH] FB-1253: Fixes for scheduled test (#2048) * fix for changes in utilCluster * fixes for samsung and backup-restore gauntlets --- qa/scripts/perf/able/ableSetup.sh | 6 ++++++ qa/scripts/perf/delete/deleteSetup.sh | 6 ++++++ qa/scripts/setupBackupRestoreGauntlet.sh | 6 ++++++ qa/scripts/setupSamsungGauntlet.sh | 6 ++++++ qa/tf/gauntlet/backuprestore/main.tf | 1 + qa/tf/gauntlet/samsung/main.tf | 1 + qa/tf/perf/able/main.tf | 1 + qa/tf/perf/delete/main.tf | 1 + 8 files changed, 28 insertions(+) diff --git a/qa/scripts/perf/able/ableSetup.sh b/qa/scripts/perf/able/ableSetup.sh index 1a72a2666..827fe0968 100755 --- a/qa/scripts/perf/able/ableSetup.sh +++ b/qa/scripts/perf/able/ableSetup.sh @@ -21,6 +21,12 @@ terraform apply -input=false -auto-approve terraform output -json > outputs.json popd +# path for ebs device +EBS_DEVICE_NAME=/dev/nvme1n1 + +# featurebase architecture +FB_BINARY=featurebase_linux_arm64 + # get the first ingest host INGESTNODE0=$(cat ./qa/tf/perf/able/outputs.json | jq -r '[.ingest_ips][0]["value"][0]') echo "using INGESTNODE0 ${INGESTNODE0}" diff --git a/qa/scripts/perf/delete/deleteSetup.sh b/qa/scripts/perf/delete/deleteSetup.sh index d4cb30769..69e162aca 100755 --- a/qa/scripts/perf/delete/deleteSetup.sh +++ b/qa/scripts/perf/delete/deleteSetup.sh @@ -21,6 +21,12 @@ terraform apply -input=false -auto-approve terraform output -json > outputs.json popd +# path for ebs device +EBS_DEVICE_NAME=/dev/nvme1n1 + +# featurebase architecture +FB_BINARY=featurebase_linux_arm64 + # get the first ingest host INGESTNODE0=$(cat ./qa/tf/perf/delete/outputs.json | jq -r '[.ingest_ips][0]["value"][0]') echo "using INGESTNODE0 ${INGESTNODE0}" diff --git a/qa/scripts/setupBackupRestoreGauntlet.sh b/qa/scripts/setupBackupRestoreGauntlet.sh index 6f8ef6380..3dd8f3c6e 100755 --- a/qa/scripts/setupBackupRestoreGauntlet.sh +++ b/qa/scripts/setupBackupRestoreGauntlet.sh @@ -14,6 +14,12 @@ terraform apply -input=false -auto-approve terraform output -json > outputs.json popd +# path for ebs device +EBS_DEVICE_NAME=/dev/nvme1n1 + +# featurebase architecture +FB_BINARY=featurebase_linux_arm64 + # get the first ingest host INGESTNODE0=$(cat ./qa/tf/gauntlet/backuprestore/outputs.json | jq -r '[.ingest_ips][0]["value"][0]') echo "using INGESTNODE0 ${INGESTNODE0}" diff --git a/qa/scripts/setupSamsungGauntlet.sh b/qa/scripts/setupSamsungGauntlet.sh index fdc7e21c4..99f9deb83 100755 --- a/qa/scripts/setupSamsungGauntlet.sh +++ b/qa/scripts/setupSamsungGauntlet.sh @@ -14,6 +14,12 @@ terraform apply -input=false -auto-approve terraform output -json > outputs.json popd +# path for ebs device +EBS_DEVICE_NAME=/dev/nvme1n1 + +# featurebase architecture +FB_BINARY=featurebase_linux_arm64 + # get the first ingest host INGESTNODE0=$(cat ./qa/tf/gauntlet/samsung/outputs.json | jq -r '[.ingest_ips][0]["value"][0]') echo "using INGESTNODE0 ${INGESTNODE0}" diff --git a/qa/tf/gauntlet/backuprestore/main.tf b/qa/tf/gauntlet/backuprestore/main.tf index 87a68d0f0..e613e4dbb 100644 --- a/qa/tf/gauntlet/backuprestore/main.tf +++ b/qa/tf/gauntlet/backuprestore/main.tf @@ -14,4 +14,5 @@ module "samsung-cluster" { vpc_cidr_block = "10.0.0.0/16" vpc_public_subnets = ["subnet-066b4b922b54e51a2", "subnet-037b8884269a69025", "subnet-08482631514426210", ] vpc_private_subnets = ["subnet-0319dde319380326f", "subnet-0517ca9a646d80f88", "subnet-05a7b685ed27eb1cf", ] + user_data = "../../.modules/featurebase-cluster/cloud-init.sh" } diff --git a/qa/tf/gauntlet/samsung/main.tf b/qa/tf/gauntlet/samsung/main.tf index 2c79a1d6c..710fcdbd6 100644 --- a/qa/tf/gauntlet/samsung/main.tf +++ b/qa/tf/gauntlet/samsung/main.tf @@ -13,4 +13,5 @@ module "samsung-cluster" { vpc_cidr_block = "10.0.0.0/16" vpc_public_subnets = ["subnet-066b4b922b54e51a2","subnet-037b8884269a69025","subnet-08482631514426210",] vpc_private_subnets = ["subnet-0319dde319380326f","subnet-0517ca9a646d80f88","subnet-05a7b685ed27eb1cf",] + user_data = "../../.modules/featurebase-cluster/cloud-init.sh" } diff --git a/qa/tf/perf/able/main.tf b/qa/tf/perf/able/main.tf index 06e192845..ff1d12446 100644 --- a/qa/tf/perf/able/main.tf +++ b/qa/tf/perf/able/main.tf @@ -14,4 +14,5 @@ module "able-cluster" { vpc_cidr_block = "10.0.0.0/16" vpc_public_subnets = ["subnet-066b4b922b54e51a2","subnet-037b8884269a69025","subnet-08482631514426210",] vpc_private_subnets = ["subnet-0319dde319380326f","subnet-0517ca9a646d80f88","subnet-05a7b685ed27eb1cf",] + user_data = "../../.modules/featurebase-cluster/cloud-init.sh" } diff --git a/qa/tf/perf/delete/main.tf b/qa/tf/perf/delete/main.tf index 4033ad1d8..bb772315e 100644 --- a/qa/tf/perf/delete/main.tf +++ b/qa/tf/perf/delete/main.tf @@ -14,4 +14,5 @@ module "delete-cluster" { vpc_cidr_block = "10.0.0.0/16" vpc_public_subnets = ["subnet-066b4b922b54e51a2", "subnet-037b8884269a69025", "subnet-08482631514426210", ] vpc_private_subnets = ["subnet-0319dde319380326f", "subnet-0517ca9a646d80f88", "subnet-05a7b685ed27eb1cf", ] + user_data = "../../.modules/featurebase-cluster/cloud-init.sh" }