From 5f662858c5499b4c1b76d76a3920136ae9ed4161 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Fri, 2 Nov 2018 15:36:39 -0400 Subject: [PATCH] Call python script for lava2 job submission Signed-off-by: Jonathan Rajotte --- scripts/system-tests/run-baremetal-benchmarks.sh | 8 ++++++++ scripts/system-tests/run-baremetal-tests.sh | 9 +++++++++ scripts/system-tests/run-kvm-fuzzing-tests.sh | 9 +++++++++ scripts/system-tests/run-kvm-tests.sh | 9 +++++++++ 4 files changed, 35 insertions(+) diff --git a/scripts/system-tests/run-baremetal-benchmarks.sh b/scripts/system-tests/run-baremetal-benchmarks.sh index 5978e0b..750ac8c 100644 --- a/scripts/system-tests/run-baremetal-benchmarks.sh +++ b/scripts/system-tests/run-baremetal-benchmarks.sh @@ -24,6 +24,14 @@ python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \ -lm "$STORAGE_LTTNG_MODULES" \ -tc "$LTTNG_TOOLS_COMMIT_ID" +python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \ + -t baremetal-benchmarks \ + -j "$JOB_NAME" \ + -k "$S3_URL_KERNEL_IMAGE" \ + -km "$S3_URL_LINUX_MODULES" \ + -lm "$S3_URL_LTTNG_MODULES" \ + -tc "$LTTNG_TOOLS_COMMIT_ID" + # Create a results folder for this job RESULT_STORAGE_FOLDER="$BASE_STORAGE_FOLDER/benchmark-results/$JOB_NAME/$BUILD_NUMBER" $SSH_COMMAND "$STORAGE_USER@$STORAGE_HOST" mkdir -p "$RESULT_STORAGE_FOLDER" diff --git a/scripts/system-tests/run-baremetal-tests.sh b/scripts/system-tests/run-baremetal-tests.sh index 62636c6..fe60bc4 100644 --- a/scripts/system-tests/run-baremetal-tests.sh +++ b/scripts/system-tests/run-baremetal-tests.sh @@ -24,3 +24,12 @@ python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \ -lm "$STORAGE_LTTNG_MODULES" \ -tc "$LTTNG_TOOLS_COMMIT_ID" \ -uc "$LTTNG_UST_COMMIT_ID" + +python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \ + -t baremetal-tests \ + -j "$JOB_NAME" \ + -k "$S3_URL_KERNEL_IMAGE" \ + -km "$S3_URL_LINUX_MODULES" \ + -lm "$S3_URL_LTTNG_MODULES" \ + -tc "$LTTNG_TOOLS_COMMIT_ID" \ + -uc "$LTTNG_UST_COMMIT_ID" diff --git a/scripts/system-tests/run-kvm-fuzzing-tests.sh b/scripts/system-tests/run-kvm-fuzzing-tests.sh index 9a405fd..1fea8a3 100644 --- a/scripts/system-tests/run-kvm-fuzzing-tests.sh +++ b/scripts/system-tests/run-kvm-fuzzing-tests.sh @@ -24,3 +24,12 @@ python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \ -lm "$STORAGE_LTTNG_MODULES" \ -tc "$LTTNG_TOOLS_COMMIT_ID" \ -uc "$LTTNG_UST_COMMIT_ID" + +python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \ + -t kvm-fuzzing-tests \ + -j "$JOB_NAME" \ + -k "$S3_URL_KERNEL_IMAGE" \ + -km "$S3_URL_LINUX_MODULES" \ + -lm "$S3_URL_LTTNG_MODULES" \ + -tc "$LTTNG_TOOLS_COMMIT_ID" \ + -uc "$LTTNG_UST_COMMIT_ID" \ diff --git a/scripts/system-tests/run-kvm-tests.sh b/scripts/system-tests/run-kvm-tests.sh index b0f8751..da80391 100644 --- a/scripts/system-tests/run-kvm-tests.sh +++ b/scripts/system-tests/run-kvm-tests.sh @@ -24,3 +24,12 @@ python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava-submit.py \ -lm "$STORAGE_LTTNG_MODULES" \ -tc "$LTTNG_TOOLS_COMMIT_ID" \ -uc "$LTTNG_UST_COMMIT_ID" + +python3 -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \ + -t kvm-tests \ + -j "$JOB_NAME" \ + -k "$S3_URL_KERNEL_IMAGE" \ + -km "$S3_URL_LINUX_MODULES" \ + -lm "$S3_URL_LTTNG_MODULES" \ + -tc "$LTTNG_TOOLS_COMMIT_ID" \ + -uc "$LTTNG_UST_COMMIT_ID" -- 2.34.1