From 8e06304165ccf50418027f65605b237eaf14aca7 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Wed, 13 Dec 2023 15:56:01 +0100 Subject: feat(bootstrap): refactor functions before bisect Ticket: CSIT-1618 Change-Id: I0c17f1e8f09a3944032d44efa8ecd36fef2056a2 Signed-off-by: Vratko Polak --- .../libraries/bash/entry/bootstrap_verify_perf.sh | 3 - .../libraries/bash/entry/bootstrap_vpp_device.sh | 3 - resources/libraries/bash/entry/per_patch_device.sh | 11 +- resources/libraries/bash/entry/per_patch_perf.sh | 22 ++-- resources/libraries/bash/function/common.sh | 37 +++++++ resources/libraries/bash/function/per_patch.sh | 123 +++++++++------------ 6 files changed, 108 insertions(+), 91 deletions(-) (limited to 'resources/libraries/bash') diff --git a/resources/libraries/bash/entry/bootstrap_verify_perf.sh b/resources/libraries/bash/entry/bootstrap_verify_perf.sh index 84d690ca12..18dfd08c39 100755 --- a/resources/libraries/bash/entry/bootstrap_verify_perf.sh +++ b/resources/libraries/bash/entry/bootstrap_verify_perf.sh @@ -46,9 +46,6 @@ archive_tests || die prepare_topology || die select_topology || die reserve_and_cleanup_testbed || die -select_tags || die -compose_robot_arguments || die -set_environment_variables || die run_robot || die move_archives || die untrap_and_unreserve_testbed || die diff --git a/resources/libraries/bash/entry/bootstrap_vpp_device.sh b/resources/libraries/bash/entry/bootstrap_vpp_device.sh index 31038b0643..fd6279f8c7 100755 --- a/resources/libraries/bash/entry/bootstrap_vpp_device.sh +++ b/resources/libraries/bash/entry/bootstrap_vpp_device.sh @@ -44,9 +44,6 @@ archive_tests || die prepare_topology || die select_topology || die activate_docker_topology || die -select_tags || die -compose_robot_arguments || die -set_environment_variables || die run_robot || die move_archives || die die_on_robot_error || die diff --git a/resources/libraries/bash/entry/per_patch_device.sh b/resources/libraries/bash/entry/per_patch_device.sh index 950a52209d..88d7f13494 100644 --- a/resources/libraries/bash/entry/per_patch_device.sh +++ b/resources/libraries/bash/entry/per_patch_device.sh @@ -39,14 +39,15 @@ 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 -initialize_csit_dirs || die +git status || die +git describe || die +build_vpp_ubuntu "CURRENT" || die +initialize_csit_dirs "current" || die get_test_code "${1-}" || die get_test_tag_string || die set_perpatch_dut || die select_arch_os || die -select_build "build_current" || die +select_build "build-root" || die check_download_dir || die activate_virtualenv "${VPP_DIR}" || die generate_tests || die @@ -54,8 +55,6 @@ archive_tests || die prepare_topology || die select_topology || die activate_docker_topology || die -select_tags || die -compose_robot_arguments || die run_robot || die move_archives || die die_on_robot_error || die diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh index aba899689e..9a825a007e 100644 --- a/resources/libraries/bash/entry/per_patch_perf.sh +++ b/resources/libraries/bash/entry/per_patch_perf.sh @@ -44,11 +44,16 @@ source "${BASH_FUNCTION_DIR}/ansible.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 -build_vpp_ubuntu_amd64 "PARENT" || die -set_aside_parent_build_artifacts || die -initialize_csit_dirs || die +git status || die +git describe || die +build_vpp_ubuntu "CURRENT" || die +set_aside_build_artifacts "current" || die +git checkout "HEAD~" || die "Failed to checkout parent commit." +git status || die +git describe || die +build_vpp_ubuntu "PARENT" || die +set_aside_build_artifacts "parent" || die +initialize_csit_dirs "parent" "current" || die get_test_code "${1-}" || die get_test_tag_string || die set_perpatch_dut || die @@ -58,9 +63,6 @@ activate_virtualenv "${VPP_DIR}" || die generate_tests || die archive_tests || die reserve_and_cleanup_testbed || die -select_tags || die -compose_robot_arguments || die -set_environment_variables || die # Support for interleaved measurements is kept for future. iterations=1 # 8 for ((iter=0; iter