X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fentry%2Fper_patch_perf.sh;h=d3aabfae17a1beacb53ce80dc6316bda2ac8c5c3;hb=refs%2Fchanges%2F11%2F17811%2F84;hp=73d4f69500dbbc665920fad451ae762cc8430624;hpb=15c227fd0a94bfcdb4617473f9e23899995c2bdd;p=csit.git

diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index 73d4f69500..d3aabfae17 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -41,10 +41,10 @@ source "${BASH_FUNCTION_DIR}/common.sh" || {
 source "${BASH_FUNCTION_DIR}/per_patch.sh" || die "Source failed."
 common_dirs || die
 set_perpatch_vpp_dir || die
-build_vpp_ubuntu_amd64 "NEW" || die
-prepare_build_parent || die
+build_vpp_ubuntu_amd64 "CURRENT" || die
+set_aside_commit_build_artifacts || die
 build_vpp_ubuntu_amd64 "PARENT" || die
-prepare_test || die
+set_aside_parent_build_artifacts || die
 ## Replace previous 4 lines with this to speed up testing.
 #download_builds "REPLACE_WITH_URL" || die
 initialize_csit_dirs || die
@@ -56,9 +56,12 @@ activate_virtualenv "${VPP_DIR}" || die
 reserve_testbed || die
 select_tags || die
 compose_pybot_arguments || die
+generate_tests || die
+archive_tests || die
 iterations=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
     select_build "build_parent" || die
     check_download_dir || die
@@ -67,13 +70,12 @@ for ((iter=0; iter<iterations; iter++)); do
     archive_parse_test_results "csit_parent/${iter}" || die
     die_on_pybot_error || die
     cleanup_topo
-    select_build "build_new" || die
+    select_build "build_current" || die
     check_download_dir || die
     run_pybot || die
     copy_archives || die
-    archive_parse_test_results "csit_new/${iter}" || die
+    archive_parse_test_results "csit_current/${iter}" || die
     die_on_pybot_error || die
 done
 untrap_and_unreserve_testbed || die
 compare_test_results  # The error code becomes this script's error code.
-# TODO: After merging, make sure archiving works as expected.