X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=e56799e63c72756afa9ab850a85ba28475f7e4d8;hp=ff632a2e97aca020f289714d2f5e01095bae3ca0;hb=3d781d7e6add31fc3729de3ad7fed1e720c8756d;hpb=e8be4c2786b17df2d73be940a48571dfb65f38c2 diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index ff632a2e97..e56799e63c 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -606,6 +606,7 @@ function prepare_topology () { # Prepare virtual testbed topology if needed based on flavor. # Variables read: + # - TEST_CODE - String affecting test selection, usually jenkins job name. # - NODENESS - Node multiplicity of testbed, either "2n" or "3n". # - FLAVOR - Node flavor string, e.g. "clx" or "skx". # Functions called: @@ -618,10 +619,12 @@ function prepare_topology () { case_text="${NODENESS}_${FLAVOR}" case "${case_text}" in "2n_aws") + export TF_VAR_testbed_name="${TEST_CODE}" terraform_init || die "Failed to call terraform init." terraform_apply || die "Failed to call terraform apply." ;; "3n_aws") + export TF_VAR_testbed_name="${TEST_CODE}" terraform_init || die "Failed to call terraform init." terraform_apply || die "Failed to call terraform apply." ;;