From e8be4c2786b17df2d73be940a48571dfb65f38c2 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Tue, 24 Aug 2021 22:06:15 +0200 Subject: Fix vpp-csit device job It uses different bootstrap than csit-vpp. Just cherry-pick the edits from https://gerrit.fd.io/r/c/csit/+/33513/15/resources/libraries/bash/entry/bootstrap_vpp_device.sh + Match just *device* when reading testplan. + Do not prepend MRR for vpp device jobs. Change-Id: I13e171551ebc87af0ac3e3a1a1bcfae7cad8326c Signed-off-by: Vratko Polak --- resources/libraries/bash/function/common.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'resources/libraries/bash/function') diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index ce0c526863..ff632a2e97 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -864,7 +864,7 @@ function select_tags () { tfd="${JOB_SPECS_DIR}" case "${TEST_CODE}" in # Select specific performance tests based on jenkins job type variable. - *"vpp-device"* ) + *"device"* ) readarray -t test_tag_array <<< $(grep -v "#" \ ${tfd}/vpp_device/${DUT}-${NODENESS}-${FLAVOR}.md | awk {"$awk_nics_sub_cmd"} || echo "devicetest") || die @@ -982,12 +982,14 @@ function select_tags () { set +x if [[ "${TEST_CODE}" == "vpp-"* ]]; then - # Automatic prefixing for VPP jobs to limit the NIC used and - # traffic evaluation to MRR. - if [[ "${TEST_TAG_STRING-}" == *"nic_"* ]]; then - prefix="${prefix}mrrAND" - else - prefix="${prefix}mrrAND${default_nic}AND" + if [[ "${TEST_CODE}" != *"device"* ]]; then + # Automatic prefixing for VPP perf jobs to limit the NIC used and + # traffic evaluation to MRR. + if [[ "${TEST_TAG_STRING-}" == *"nic_"* ]]; then + prefix="${prefix}mrrAND" + else + prefix="${prefix}mrrAND${default_nic}AND" + fi fi fi for tag in "${test_tag_array[@]}"; do -- cgit 1.2.3-korg