diff options
| -rw-r--r-- | resources/libraries/bash/entry/per_patch_device.sh | 5 | ||||
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/resources/libraries/bash/entry/per_patch_device.sh b/resources/libraries/bash/entry/per_patch_device.sh index efa925eda0..db977b6e96 100644 --- a/resources/libraries/bash/entry/per_patch_device.sh +++ b/resources/libraries/bash/entry/per_patch_device.sh @@ -45,15 +45,16 @@ initialize_csit_dirs || die get_test_code "${1-}" || die get_test_tag_string || die set_perpatch_dut || die -select_topology || die select_arch_os || die select_build "build_current" || die check_download_dir || die activate_virtualenv "${VPP_DIR}" || die generate_tests || die archive_tests || die +prepare_topology || die +select_topology || die activate_docker_topology || die -select_vpp_device_tags || die +select_tags || die compose_pybot_arguments || die run_pybot || die move_archives || die 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 |