Continue reservation when cleanup fails

[csit.git] / resources / libraries / bash / entry / per_patch_perf.sh

diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index 82dadc2..195d1a7 100644 (file)
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -52,17 +52,18 @@ get_test_code "${1-}" || die
 get_test_tag_string || die
 set_perpatch_dut || die
 select_topology || die
+select_os || die
 activate_virtualenv "${VPP_DIR}" || die
-reserve_testbed || die
-select_tags || die
-compose_pybot_arguments || die
 generate_tests || die
 archive_tests || die
+reserve_and_cleanup_testbed || die
+select_tags || die
+compose_pybot_arguments || die
 # Support for interleaved measurements is kept for future.
 iterations=1 # 8
 for ((iter=0; iter<iterations; iter++)); do
     if ((iter)); then
-        # Reserve testbed has already cleaned it once,
+        # Function reserve_and_cleanup_testbed has already cleaned it once,
         # but we need to clean it explicitly on subsequent iterations.
         cleanup_topo
     fi