X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fentry%2Fper_patch_perf.sh;h=ad0ae900859dbce14a4c930887f327a87dca6b19;hb=refs%2Fchanges%2F93%2F21393%2F2;hp=195d1a70e0da41c3db823616d5d646077b2c5008;hpb=4cb1e342832d8bd94d62f6f283223b54e426926b;p=csit.git

diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index 195d1a70e0..ad0ae90085 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -40,6 +40,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
@@ -52,7 +53,7 @@ get_test_code "${1-}" || die
 get_test_tag_string || die
 set_perpatch_dut || die
 select_topology || die
-select_os || die
+select_arch_os || die
 activate_virtualenv "${VPP_DIR}" || die
 generate_tests || die
 archive_tests || die
@@ -67,19 +68,20 @@ for ((iter=0; iter<iterations; iter++)); do
         # but we need to clean it explicitly on subsequent iterations.
         cleanup_topo
     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
+    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