aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2019-04-24 10:51:37 +0200
committerVratko Polak <vrpolak@cisco.com>2019-04-24 10:51:37 +0200
commit91f2cb2b789c8cfcaa7fe3d7617fe6b8230df22a (patch)
treebf8f52ef56b53a31c0feef791c338c1435819b82 /resources
parent77d115dc74b2892b63d59c2fe25e712bce4f5013 (diff)
Move generate_tests earlier in entry scripts
The idea is to run test generation and archivation before testbed reservation, as during generation and archivation the testbed can be used by another job. The two steps are moved just before (physical or docker) reservation, as they currently take considerable time, so simpler steps are kept before to save time if they fail. Coincidentally, it is also just after activate_virtualenv, Python is needed for test generation. Change-Id: I8b41b91dba8118e89301e3fcf89d5cd14ac054a2 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/bash/entry/bootstrap_verify_perf.sh4
-rwxr-xr-xresources/libraries/bash/entry/bootstrap_vpp_device.sh4
-rw-r--r--resources/libraries/bash/entry/per_patch_device.sh4
-rw-r--r--resources/libraries/bash/entry/per_patch_perf.sh4
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