X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fentry%2Fper_patch_perf.sh;h=ef75ea90ceb15696b6eb7bf1d2fd295376732951;hb=c79c748013ec53ff59e9260034822a5b26afa441;hp=d3aabfae17a1beacb53ce80dc6316bda2ac8c5c3;hpb=5e6145a4260ffce1c302e94b9b241851f90838e1;p=csit.git

diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index d3aabfae17..ef75ea90ce 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -52,23 +52,28 @@ get_test_code "${1-}" || die
 get_test_tag_string || die
 set_perpatch_dut || die
 select_topology || die
+select_arch_os || die
 activate_virtualenv "${VPP_DIR}" || die
-reserve_testbed || die
-select_tags || die
-compose_pybot_arguments || die
 generate_tests || die
 archive_tests || die
-iterations=8
+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
-    # TODO: Use less heavy way to avoid apt remove falilures.
-    # Also, reserve_testbed has already called cleanup once.
-    cleanup_topo
+    if ((iter)); then
+        # Function reserve_and_cleanup_testbed has already cleaned it once,
+        # but we need to clean it explicitly on subsequent iterations.
+        cleanup_topo
+    fi
     select_build "build_parent" || die
     check_download_dir || die
     run_pybot || die
     copy_archives || die
     archive_parse_test_results "csit_parent/${iter}" || die
     die_on_pybot_error || die
+    # TODO: Use less heavy way to avoid apt remove failures.
     cleanup_topo
     select_build "build_current" || die
     check_download_dir || die