From: pmikus <pmikus@cisco.com>
Date: Fri, 18 Dec 2020 06:38:48 +0000 (+0000)
Subject: FIX: Backward compatibility include selection
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=e8a342d36e1a0de38bcbaa8af27692e75f722779

FIX: Backward compatibility include selection

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Ieff60a44d42d66acee8ba1680e7e285d6cd01bc9
(cherry picked from commit e62ade12b7c9918cda2d363387ed0f517aa9840d)
---

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index b827a054fb..2f15762da5 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -291,11 +291,17 @@ function compose_pybot_arguments () {
         if [[ ${tag} == "!"* ]]; then
             EXPANDED_TAGS+=("--exclude" "${tag#$"!"}")
         else
-            EXPANDED_TAGS+=("${SELECTION_MODE}" "${tag}")
+            if [[ ${SELECTION_MODE} == "--test" ]]; then
+                EXPANDED_TAGS+=("--test" "${tag}")
+            else
+                EXPANDED_TAGS+=("--include" "${TOPOLOGIES_TAGS}AND${tag}")
+            fi
         fi
     done
 
-    EXPANDED_TAGS+=("--include" "${TOPOLOGIES_TAGS}")
+    if [[ ${SELECTION_MODE} == "--test" ]]; then
+        EXPANDED_TAGS+=("--include" "${TOPOLOGIES_TAGS}")
+    fi
 }
 
 
@@ -1061,6 +1067,7 @@ function select_vpp_device_tags () {
                 # If trigger contains tags, split them into array.
                 test_tag_array=(${TEST_TAG_STRING//:/ })
             fi
+            SELECTION_MODE="--include"
             ;;
     esac