From 5c804456111d3ba903fa55001129caf2d82288b2 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 18 Dec 2020 06:38:48 +0000 Subject: FIX: Backward compatibility include selection Signed-off-by: pmikus Change-Id: Ieff60a44d42d66acee8ba1680e7e285d6cd01bc9 (cherry picked from commit e62ade12b7c9918cda2d363387ed0f517aa9840d) --- resources/libraries/bash/function/common.sh | 11 +++++++++-- 1 file 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 -- cgit 1.2.3-korg