X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fentry%2Fper_patch_perf.sh;h=3569b2149708a30c4de923c1793dced319445e1b;hb=91f2cb2b789c8cfcaa7fe3d7617fe6b8230df22a;hp=c176bbfd5f24415b41bb7c80f3b7dd0716743051;hpb=fa0fe5c805169951c466d3b18091c0cfc52dd5ca;p=csit.git

diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index c176bbfd5f..3569b21497 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -53,19 +53,26 @@ get_test_tag_string || die
 set_perpatch_dut || die
 select_topology || die
 activate_virtualenv "${VPP_DIR}" || die
+generate_tests || die
+archive_tests || die
 reserve_testbed || die
 select_tags || die
 compose_pybot_arguments || die
-iterations=8
+# 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.
-    cleanup_topo
+    if ((iter)); then
+        # Reserve 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