X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fentry%2Fper_patch_device.sh;h=db977b6e96d72f686d2e79e50accb1e9b1d146f6;hp=7115dc14fc3cf532490463bf01c677d3be3fdf2b;hb=e8be4c2786b17df2d73be940a48571dfb65f38c2;hpb=5e6145a4260ffce1c302e94b9b241851f90838e1

diff --git a/resources/libraries/bash/entry/per_patch_device.sh b/resources/libraries/bash/entry/per_patch_device.sh
index 7115dc14fc..db977b6e96 100644
--- a/resources/libraries/bash/entry/per_patch_device.sh
+++ b/resources/libraries/bash/entry/per_patch_device.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@ set -exuo pipefail
 # + Everything needed to build VPP is already installed locally.
 # Consequences:
 # + The following directories (relative to VPP repo) are (re)created:
-# ++ csit_current, build_current, archive, csit/archive, csit_download_dir.
+# ++ csit_current, build_current, archives, csit/archives, csit_download_dir.
 
 # TODO: Implement some kind of VPP build caching.
 
@@ -37,6 +37,7 @@ source "${BASH_FUNCTION_DIR}/common.sh" || {
 }
 source "${BASH_FUNCTION_DIR}/per_patch.sh" || die "Source failed."
 common_dirs || die
+check_prerequisites || die
 set_perpatch_vpp_dir || die
 build_vpp_ubuntu_amd64 "CURRENT" || die
 set_aside_commit_build_artifacts || die
@@ -44,16 +45,17 @@ 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
-activate_docker_topology || die
-select_vpp_device_tags || die
-compose_pybot_arguments || die
 generate_tests || die
 archive_tests || die
+prepare_topology || die
+select_topology || die
+activate_docker_topology || die
+select_tags || die
+compose_pybot_arguments || die
 run_pybot || die
-copy_archives || die
-archive_test_results "csit_current" || die
+move_archives || die
 die_on_pybot_error || die