aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2020-12-18 06:38:48 +0000
committerPeter Mikus <pmikus@cisco.com>2020-12-18 09:39:18 +0000
commite8a342d36e1a0de38bcbaa8af27692e75f722779 (patch)
tree7bd9dfb8320f8ce934a5f22e17c4ebcc72917682
parent12cd38dd6d37176e71a3454e3454cea96d02d61b (diff)
FIX: Backward compatibility include selection
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: Ieff60a44d42d66acee8ba1680e7e285d6cd01bc9 (cherry picked from commit e62ade12b7c9918cda2d363387ed0f517aa9840d)
-rw-r--r--resources/libraries/bash/function/common.sh11
1 files changed, 9 insertions, 2 deletions
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