X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fentry%2Fper_patch_perf.sh;h=95b067bbd3ba8a538fd1acfcab19981b0e8c201e;hb=a31a47b1b497efffbcbb92004d32885a84f4ff4f;hp=afe5f97575505d6c73490511050cadde4a983064;hpb=17983da5a95d53d2be69537e3816438d114c3d5b;p=csit.git

diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index afe5f97575..95b067bbd3 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -39,6 +39,8 @@ source "${BASH_FUNCTION_DIR}/common.sh" || {
     exit 1
 }
 source "${BASH_FUNCTION_DIR}/per_patch.sh" || die "Source failed."
+# Cleanup needs ansible.
+source "${BASH_FUNCTION_DIR}/ansible.sh" || die "Source failed."
 common_dirs || die
 check_prerequisites || die
 set_perpatch_vpp_dir || die
@@ -66,21 +68,22 @@ for ((iter=0; iter<iterations; iter++)); do
     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
+        ansible_hosts "cleanup" || die
     fi
-    select_build "build_parent" || die
+    # Testing current first. Good for early failures or for API changes.
+    select_build "build_current" || die
     check_download_dir || die
     run_pybot || die
     copy_archives || die
-    archive_parse_test_results "csit_parent/${iter}" || die
+    archive_parse_test_results "csit_current/${iter}" || die
     die_on_pybot_error || die
     # TODO: Use less heavy way to avoid apt remove failures.
-    cleanup_topo
-    select_build "build_current" || die
+    ansible_hosts "cleanup" || die
+    select_build "build_parent" || die
     check_download_dir || die
     run_pybot || die
     copy_archives || die
-    archive_parse_test_results "csit_current/${iter}" || die
+    archive_parse_test_results "csit_parent/${iter}" || die
     die_on_pybot_error || die
 done
 untrap_and_unreserve_testbed || die