X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=89e1af1c79365acffbbc72e7fd34c97f41f432dd;hb=dfcefbd900389576769cfb6d61390c35d143541c;hp=93adda7e0cde4671002d1c2a9147d9086b1c0f21;hpb=b0d6fc976be09da5d5c0d57b58a87d8b0b286ca4;p=csit.git diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 93adda7e0c..89e1af1c79 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -182,19 +182,6 @@ function check_prerequisites () { fi } -function cleanup_topo () { - - # Variables read: - # - WORKING_TOPOLOGY - Path to topology yaml file of the reserved testbed. - # - PYTHON_SCRIPTS_DIR - Path to directory holding the reservation script. - - set -exuo pipefail - - python "${PYTHON_SCRIPTS_DIR}/topo_cleanup.py" -t "${WORKING_TOPOLOGY}" - # Not using "|| die" as some callers might want to ignore errors, - # e.g. in teardowns, such as unreserve. -} - function common_dirs () { @@ -781,7 +768,8 @@ function select_tags () { ${tfd}/mrr-daily-${FLAVOR}.txt) || die ;; *"mrr-weekly"* ) - readarray -t test_tag_array < "${tfd}/mrr-weekly.txt" || die + readarray -t test_tag_array <<< $(${sed_nic_sub_cmd} \ + ${tfd}/mrr-weekly.txt) || die ;; * ) if [[ -z "${TEST_TAG_STRING-}" ]]; then