X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=ec335f171f8145a67e4bfe3859616ee2a75fc32a;hb=806a069bc5494d1c43dd9711e1512e518c823acd;hp=d34035a0031b50841c13749fa812f79cb123ce9c;hpb=de08ebfec25d2d9bb3f3b46c07a5bcb9efd24d1c;p=csit.git

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index d34035a003..ec335f171f 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -710,6 +710,7 @@ function select_tags () {
     # Variables read:
     # - WORKING_TOPOLOGY - Path to topology yaml file of the reserved testbed.
     # - TEST_CODE - String affecting test selection, usually jenkins job name.
+    # - DUT - CSIT test/ subdirectory, set while processing tags.
     # - TEST_TAG_STRING - String selecting tags, from gerrit comment.
     #   Can be unset.
     # - TOPOLOGIES_DIR - Path to existing directory with available tpologies.
@@ -769,22 +770,33 @@ function select_tags () {
         # Select specific performance tests based on jenkins job type variable.
         *"ndrpdr-weekly"* )
             readarray -t test_tag_array <<< $(sed 's/ //g' \
-                ${tfd}/mlr-weekly-${NODENESS}-${FLAVOR}.md |
+                ${tfd}/mlr_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
                 eval ${sed_nics_sub_cmd}) || die
             ;;
         *"mrr-daily"* )
             readarray -t test_tag_array <<< $(sed 's/ //g' \
-                ${tfd}/mrr-daily-${NODENESS}-${FLAVOR}.md |
+                ${tfd}/mrr_daily/${DUT}-${NODENESS}-${FLAVOR}.md |
                 eval ${sed_nics_sub_cmd}) || die
             ;;
         *"mrr-weekly"* )
             readarray -t test_tag_array <<< $(sed 's/ //g' \
-                ${tfd}/mrr-weekly-${NODENESS}-${FLAVOR}.md |
+                ${tfd}/mrr_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
                 eval ${sed_nics_sub_cmd}) || die
             ;;
         *"report-iterative"* )
+            test_sets=(${TEST_TAG_STRING//:/ })
+            # Run only one test set per run
+            report_file=${test_sets[0]}.md
+            readarray -t test_tag_array <<< $(sed 's/ //g' \
+                ${tfd}/report_iterative/${NODENESS}-${FLAVOR}/${report_file} |
+                eval ${sed_nics_sub_cmd}) || die
+            ;;
+        *"report-coverage"* )
+            test_sets=(${TEST_TAG_STRING//:/ })
+            # Run only one test set per run
+            report_file=${test_sets[0]}.md
             readarray -t test_tag_array <<< $(sed 's/ //g' \
-                ${tfd}/report-iter-${NODENESS}-${FLAVOR}.md |
+                ${tfd}/report_coverage/${NODENESS}-${FLAVOR}/${report_file} |
                 eval ${sed_nics_sub_cmd}) || die
             ;;
         * )