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/entry/per_patch_device.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'resources/libraries/bash/entry') 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 -- cgit 1.2.3-korg