aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuraj.linkes <juraj.linkes@pantheon.tech>2019-07-19 11:37:18 +0200
committerVratko Polak <vrpolak@cisco.com>2019-07-19 12:18:55 +0000
commitbf33e6ad528aa29989b2d074e49b631fa584cbed (patch)
tree5e539436979e672c082d6f9c9fda540a1a86f087
parentb836fd8d6d096a9c9688dab166b0beac8a8d3f92 (diff)
Add support for default_nic in mrr tag lists
Change-Id: I1fdc6f3019af6d46b985164c573d44b0e440febd Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>
-rw-r--r--resources/libraries/bash/function/common.sh5
-rw-r--r--resources/libraries/bash/function/mrr-daily.txt8
2 files changed, 7 insertions, 6 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index a7f79e0de9..696fc71189 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -727,6 +727,7 @@ function select_tags () {
;;
esac
+ sed_nic_sub_cmd="sed s/\${default_nic}/${default_nic}/"
# Tag file directory shorthand.
tfd="${BASH_FUNCTION_DIR}"
case "${TEST_CODE}" in
@@ -735,8 +736,8 @@ function select_tags () {
readarray -t test_tag_array < "${tfd}/mlr-weekly.txt" || die
;;
*"mrr-daily"* )
- readarray -t test_tag_array < \
- "${tfd}/mrr-daily-${FLAVOR}.txt" || die
+ readarray -t test_tag_array <<< $(${sed_nic_sub_cmd} \
+ ${tfd}/mrr-daily-${FLAVOR}.txt) || die
;;
*"mrr-weekly"* )
readarray -t test_tag_array < "${tfd}/mrr-weekly.txt" || die
diff --git a/resources/libraries/bash/function/mrr-daily.txt b/resources/libraries/bash/function/mrr-daily.txt
index 7d060dd7d6..20af48aad4 100644
--- a/resources/libraries/bash/function/mrr-daily.txt
+++ b/resources/libraries/bash/function/mrr-daily.txt
@@ -1,8 +1,8 @@
-mrrANDnic_intel-x710ANDbaseAND64bNOTnf_density
-mrrANDnic_intel-x710ANDbaseAND78bNOTnf_density
+mrrAND${default_nic}ANDbaseAND64bNOTnf_density
+mrrAND${default_nic}ANDbaseAND78bNOTnf_density
mrrAND64bANDip4baseNOTdot1q
mrrAND78bANDip6baseNOTdot1q
mrrAND64bANDl2bdbaseNOTdot1q
mrrAND64bANDl2xcbaseNOTdot1q
-mrrANDnic_intel-x710ANDscaleAND64bNOT4cNOTnf_density
-mrrANDnic_intel-x710ANDscaleAND78bNOT4cNOTnf_density
+mrrAND${default_nic}ANDscaleAND64bNOT4cNOTnf_density
+mrrAND${default_nic}ANDscaleAND78bNOT4cNOTnf_density