X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fentry%2Fper_patch_perf.sh;h=565a566eb0fa6c033596713811d47a02ea27a9a8;hb=8079ed2ff7e2fdd41474d286b98cd9be19481f7a;hp=abb1001652b5700e87fe38db8093926e6038b5e7;hpb=d465d9fba33a323703a2bf40c499d74d0f017091;p=csit.git

diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index abb1001652..565a566eb0 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -27,7 +27,7 @@ set -exuo pipefail
 # + Directories build_root, build and csit are reset during the run.
 # + The following directories (relative to VPP repo) are (re)created:
 # ++ csit_new, csit_parent, build_new, build_parent,
-# ++ archive, csit/archive, csit_download_dir.
+# ++ archives, csit/archives, csit_download_dir.
 
 # TODO: Implement some kind of VPP build caching.
 
@@ -39,41 +39,48 @@ 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
-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
-## Replace previous 4 lines with this to speed up testing.
-#download_builds "https://jenkins.fd.io/sandbox/job/vpp-csit-verify-perf-master-2n-skx/2/artifact/*zip*/archive.zip" || die
+set_aside_parent_build_artifacts || die
 initialize_csit_dirs || die
-get_test_tag_string || die
 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
+generate_tests || die
+archive_tests || die
+reserve_and_cleanup_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
-    select_build "build_parent" || die
+    if ((iter)); then
+        # Function reserve_and_cleanup_testbed has already cleaned it once,
+        # but we need to clean it explicitly on subsequent iterations.
+        ansible_playbook "cleanup" || die
+    fi
+    # 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
-    cleanup_topo
-    select_build "build_new" || die
+    # TODO: Use less heavy way to avoid apt remove failures.
+    ansible_playbook "cleanup" || die
+    select_build "build_parent" || die
     check_download_dir || die
     run_pybot || die
-    copy_archives || die
-    archive_parse_test_results "csit_new/${iter}" || die
+    archive_parse_test_results "csit_parent/${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.