diff options
| author |   pmikus <pmikus@cisco.com> | 2020-12-18 06:38:48 +0000 |
|---|---|---|
| committer |   Vratko Polak <vrpolak@cisco.com> | 2021-01-11 12:45:27 +0000 |
| commit | 5c804456111d3ba903fa55001129caf2d82288b2 (patch) | |
| tree | dffccbe4bf678bb5fbcd9e9aaeaa5cb3bc4bcf86 | |
| parent | 43b2006b9b0316e02984d14542e0463775dd3464 (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.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 82c1fd40cb..b0eaf6cd25 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 } @@ -1072,6 +1078,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 |