4 files changed, 8 insertions, 8 deletions
diff --git a/resources/libraries/bash/entry/bootstrap_verify_perf.sh b/resources/libraries/bash/entry/bootstrap_verify_perf.sh
index 7c00491c90..c0479a742c 100644
--- a/resources/libraries/bash/entry/bootstrap_verify_perf.sh
+++ b/resources/libraries/bash/entry/bootstrap_verify_perf.sh
@@ -39,12 +39,12 @@ select_topology || die
 gather_build || die
 check_download_dir || die
 activate_virtualenv || die
+generate_tests || die
+archive_tests || die
 reserve_testbed || die
 ansible_hosts "run-jitter-tool" || die
 select_tags || die
 compose_pybot_arguments || die
-generate_tests || die
-archive_tests || die
 run_pybot || die
 untrap_and_unreserve_testbed || die
 copy_archives || die
diff --git a/resources/libraries/bash/entry/bootstrap_vpp_device.sh b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
index 156a8b32ac..9605f70a4f 100755
--- a/resources/libraries/bash/entry/bootstrap_vpp_device.sh
+++ b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
@@ -38,11 +38,11 @@ select_topology || die
 gather_build || die
 check_download_dir || die
 activate_virtualenv || die
+generate_tests || die
+archive_tests || die
 activate_docker_topology || die
 select_vpp_device_tags || die
 compose_pybot_arguments || die
-generate_tests || die
-archive_tests || die
 run_pybot || die
 copy_archives || die
 die_on_pybot_error || die
diff --git a/resources/libraries/bash/entry/per_patch_device.sh b/resources/libraries/bash/entry/per_patch_device.sh
index 7115dc14fc..19137e982c 100644
--- a/resources/libraries/bash/entry/per_patch_device.sh
+++ b/resources/libraries/bash/entry/per_patch_device.sh
@@ -48,11 +48,11 @@ select_topology || die
 select_build "build_current" || die
 check_download_dir || die
 activate_virtualenv "${VPP_DIR}" || die
+generate_tests || die
+archive_tests || die
 activate_docker_topology || die
 select_vpp_device_tags || die
 compose_pybot_arguments || die
-generate_tests || die
-archive_tests || die
 run_pybot || die
 copy_archives || die
 archive_test_results "csit_current" || die
diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index 82dadc2ed6..3569b21497 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -53,11 +53,11 @@ get_test_tag_string || die
 set_perpatch_dut || die
 select_topology || die
 activate_virtualenv "${VPP_DIR}" || die
+generate_tests || die
+archive_tests || die
 reserve_testbed || die
 select_tags || die
 compose_pybot_arguments || die
-generate_tests || die
-archive_tests || die
 # Support for interleaved measurements is kept for future.
 iterations=1 # 8
 for ((iter=0; iter<iterations; iter++)); do