LAVA: run lava2 submit first for easier migration iteration

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>

diff --git a/scripts/system-tests/run-baremetal-benchmarks.sh b/scripts/system-tests/run-baremetal-benchmarks.sh
index 1449ebf30f25f34d10a2e4bcf8609189223344b3..596eb24e86f394c81c7619903d557b7c6712302e 100644 (file)
--- a/scripts/system-tests/run-baremetal-benchmarks.sh
+++ b/scripts/system-tests/run-baremetal-benchmarks.sh
@@ -24,14 +24,6 @@ source "${venv}/bin/activate"
 set -eu
 pip install pyyaml Jinja2
 
-python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
-                          -t baremetal-benchmarks \
-                          -j "$JOB_NAME" \
-                          -k "$STORAGE_KERNEL_IMAGE" \
-                          -km "$STORAGE_LINUX_MODULES" \
-                          -lm "$STORAGE_LTTNG_MODULES" \
-                          -tc "$LTTNG_TOOLS_COMMIT_ID"
-
 python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -t baremetal-benchmarks \
                           -j "$JOB_NAME" \
@@ -40,6 +32,15 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -lm "$S3_URL_LTTNG_MODULES" \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           --debug
+
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
+                          -t baremetal-benchmarks \
+                          -j "$JOB_NAME" \
+                          -k "$STORAGE_KERNEL_IMAGE" \
+                          -km "$STORAGE_LINUX_MODULES" \
+                          -lm "$STORAGE_LTTNG_MODULES" \
+                          -tc "$LTTNG_TOOLS_COMMIT_ID"
+
 set +eu
 deactivate
 set -eu

diff --git a/scripts/system-tests/run-baremetal-tests.sh b/scripts/system-tests/run-baremetal-tests.sh
index f1afabc1938245066ebe35b300dd1a02c0375d03..34270a9616338da5dd36b6d1838e000789eef267 100644 (file)
--- a/scripts/system-tests/run-baremetal-tests.sh
+++ b/scripts/system-tests/run-baremetal-tests.sh
@@ -25,15 +25,6 @@ source "${venv}/bin/activate"
 set -eu
 pip install pyyaml Jinja2
 
-python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
-                          -t baremetal-tests \
-                          -j "$JOB_NAME" \
-                          -k "$STORAGE_KERNEL_IMAGE" \
-                          -km "$STORAGE_LINUX_MODULES" \
-                          -lm "$STORAGE_LTTNG_MODULES" \
-                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
-                          -uc "$LTTNG_UST_COMMIT_ID"
-
 python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -t baremetal-tests \
                           -j "$JOB_NAME" \
@@ -43,6 +34,16 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID" \
                           --debug
+
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
+                          -t baremetal-tests \
+                          -j "$JOB_NAME" \
+                          -k "$STORAGE_KERNEL_IMAGE" \
+                          -km "$STORAGE_LINUX_MODULES" \
+                          -lm "$STORAGE_LTTNG_MODULES" \
+                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
+                          -uc "$LTTNG_UST_COMMIT_ID"
+
 set +eu
 deactivate
 set -eu

diff --git a/scripts/system-tests/run-kvm-fuzzing-tests.sh b/scripts/system-tests/run-kvm-fuzzing-tests.sh
index d5a11edafb773501e6da59cc36eb9b377fd4805e..d4b7187a6a4687efccc101f6d720700555b1a9b5 100644 (file)
--- a/scripts/system-tests/run-kvm-fuzzing-tests.sh
+++ b/scripts/system-tests/run-kvm-fuzzing-tests.sh
@@ -24,15 +24,6 @@ source "${venv}/bin/activate"
 set -eu
 pip install pyyaml Jinja2
 
-python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
-                          -t kvm-fuzzing-tests \
-                          -j "$JOB_NAME" \
-                          -k "$STORAGE_KERNEL_IMAGE" \
-                          -km "$STORAGE_LINUX_MODULES" \
-                          -lm "$STORAGE_LTTNG_MODULES" \
-                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
-                          -uc "$LTTNG_UST_COMMIT_ID"
-
 python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -t kvm-fuzzing-tests \
                           -j "$JOB_NAME" \
@@ -42,6 +33,16 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID" \
                           --debug
+
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
+                          -t kvm-fuzzing-tests \
+                          -j "$JOB_NAME" \
+                          -k "$STORAGE_KERNEL_IMAGE" \
+                          -km "$STORAGE_LINUX_MODULES" \
+                          -lm "$STORAGE_LTTNG_MODULES" \
+                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
+                          -uc "$LTTNG_UST_COMMIT_ID"
+
 set +eu
 deactivate
 set -eu

diff --git a/scripts/system-tests/run-kvm-tests.sh b/scripts/system-tests/run-kvm-tests.sh
index 2d8ad7fc0e456d667e6e42026b133c9b4ee0f3f7..dc2a9e400a6aef23f58f117f5432ebe84dc77c57 100644 (file)
--- a/scripts/system-tests/run-kvm-tests.sh
+++ b/scripts/system-tests/run-kvm-tests.sh
@@ -24,15 +24,6 @@ source "${venv}/bin/activate"
 set -eu
 pip install pyyaml Jinja2
 
-python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
-                          -t kvm-tests \
-                          -j "$JOB_NAME" \
-                          -k "$STORAGE_KERNEL_IMAGE" \
-                          -km "$STORAGE_LINUX_MODULES" \
-                          -lm "$STORAGE_LTTNG_MODULES" \
-                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
-                          -uc "$LTTNG_UST_COMMIT_ID"
-
 python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -t kvm-tests \
                           -j "$JOB_NAME" \
@@ -42,6 +33,16 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \
                           -tc "$LTTNG_TOOLS_COMMIT_ID" \
                           -uc "$LTTNG_UST_COMMIT_ID" \
                           --debug
+
+python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \
+                          -t kvm-tests \
+                          -j "$JOB_NAME" \
+                          -k "$STORAGE_KERNEL_IMAGE" \
+                          -km "$STORAGE_LINUX_MODULES" \
+                          -lm "$STORAGE_LTTNG_MODULES" \
+                          -tc "$LTTNG_TOOLS_COMMIT_ID" \
+                          -uc "$LTTNG_UST_COMMIT_ID"
+
 set +eu
 deactivate
 set -eu