Add support for default_nic in mrr tag lists

Change-Id: I1fdc6f3019af6d46b985164c573d44b0e440febd
Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index a7f79e0..696fc71 100644 (file)
--- 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 7d060dd..20af48a 100644 (file)
--- 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