From c29cba19a4d7bd96fdbeb5919b64ce25bc843c89 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 20 Nov 2018 16:30:03 -0500 Subject: [PATCH] LAVA: run lava2 submit first for easier migration iteration Signed-off-by: Jonathan Rajotte --- .../system-tests/run-baremetal-benchmarks.sh | 17 +++++++++-------- scripts/system-tests/run-baremetal-tests.sh | 19 ++++++++++--------- scripts/system-tests/run-kvm-fuzzing-tests.sh | 19 ++++++++++--------- scripts/system-tests/run-kvm-tests.sh | 19 ++++++++++--------- 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/scripts/system-tests/run-baremetal-benchmarks.sh b/scripts/system-tests/run-baremetal-benchmarks.sh index 1449ebf..596eb24 100644 --- 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 f1afabc..34270a9 100644 --- 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 d5a11ed..d4b7187 100644 --- 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 2d8ad7f..dc2a9e4 100644 --- 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 -- 2.34.1