From ae81c6c8ea54cd0ceee739fbce5d7e2445689ecb Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Mon, 25 May 2020 17:50:28 +0200 Subject: FIX: add dpdk mrr_weekly and report_iterative job specs - split job specs to directories Change-Id: I9a71621216ab0bdf85d147ce03f473e7cbb0b266 Signed-off-by: Jan Gelety --- resources/libraries/bash/function/common.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'resources/libraries/bash/function/common.sh') diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 873c52ed63..3d59506e50 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,22 @@ 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"* ) readarray -t test_tag_array <<< $(sed 's/ //g' \ - ${tfd}/report-iter-${NODENESS}-${FLAVOR}.md | + ${tfd}/report_iterative/${DUT}-${NODENESS}-${FLAVOR}.md | eval ${sed_nics_sub_cmd}) || die ;; *"report-coverage"* ) -- cgit 1.2.3-korg