From eb5bdbeb3cd60f055476b48a1c85cf74f8fe7cf9 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Thu, 24 Oct 2019 16:19:20 -0400 Subject: [PATCH] jjb: system-tests: add parameters for Tools and UST git repos This is useful to launch custom jobs on a specific repo to test something. Signed-off-by: Francis Deslauriers --- scripts/system-tests/lava2-submit.py | 8 ++++++-- scripts/system-tests/run-baremetal-benchmarks.sh | 1 + scripts/system-tests/run-baremetal-tests.sh | 2 ++ scripts/system-tests/run-kvm-fuzzing-tests.sh | 2 ++ scripts/system-tests/run-kvm-tests.sh | 2 ++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py index 2fa8145..7b42d22 100644 --- a/scripts/system-tests/lava2-submit.py +++ b/scripts/system-tests/lava2-submit.py @@ -122,7 +122,7 @@ def print_test_output(server, job): if print_line: print("{} {}".format(line['dt'], line['msg'])) -def get_vlttng_cmd(lttng_tools_commit, lttng_ust_commit=None): +def get_vlttng_cmd(lttng_tools_url, lttng_tools_commit, lttng_ust_url=None, lttng_ust_commit=None): """ Return vlttng cmd to be used in the job template for setup. """ @@ -133,11 +133,13 @@ def get_vlttng_cmd(lttng_tools_commit, lttng_ust_commit=None): ' --profile babeltrace-stable-1.4' \ ' --profile babeltrace-python' \ ' --profile lttng-tools-master' \ + ' --override projects.lttng-tools.source='+lttng_tools_url + \ ' --override projects.lttng-tools.checkout='+lttng_tools_commit + \ ' --profile lttng-tools-no-man-pages' if lttng_ust_commit is not None: vlttng_cmd += ' --profile lttng-ust-master ' \ + ' --override projects.lttng-ust.source='+lttng_ust_url + \ ' --override projects.lttng-ust.checkout='+lttng_ust_commit+ \ ' --profile lttng-ust-no-man-pages' @@ -155,8 +157,10 @@ def main(): parser.add_argument('-j', '--jobname', required=True) parser.add_argument('-k', '--kernel', required=True) parser.add_argument('-lm', '--lmodule', required=True) + parser.add_argument('-tu', '--tools-url', required=True) parser.add_argument('-tc', '--tools-commit', required=True) parser.add_argument('-id', '--build-id', required=True) + parser.add_argument('-uu', '--ust-url', required=False) parser.add_argument('-uc', '--ust-commit', required=False) parser.add_argument('-d', '--debug', required=False, action='store_true') args = parser.parse_args() @@ -191,7 +195,7 @@ def main(): vlttng_path = '/tmp/virtenv' - vlttng_cmd = get_vlttng_cmd(args.tools_commit, args.ust_commit) + vlttng_cmd = get_vlttng_cmd(args.tools_url, args.tools_commit, args.ust_url, args.ust_commit) context = dict() context['DeviceType'] = DeviceType diff --git a/scripts/system-tests/run-baremetal-benchmarks.sh b/scripts/system-tests/run-baremetal-benchmarks.sh index 0313d30..e623f3d 100644 --- a/scripts/system-tests/run-baremetal-benchmarks.sh +++ b/scripts/system-tests/run-baremetal-benchmarks.sh @@ -29,6 +29,7 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \ -j "$JOB_NAME" \ -k "$S3_URL_KERNEL_IMAGE" \ -lm "$S3_URL_LTTNG_MODULES" \ + -tu "$LTTNG_TOOLS_REPO" \ -tc "$LTTNG_TOOLS_COMMIT_ID" \ -id "$BUILD_TAG" set +eu diff --git a/scripts/system-tests/run-baremetal-tests.sh b/scripts/system-tests/run-baremetal-tests.sh index 6b62f6d..f289b71 100644 --- a/scripts/system-tests/run-baremetal-tests.sh +++ b/scripts/system-tests/run-baremetal-tests.sh @@ -30,6 +30,8 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \ -j "$JOB_NAME" \ -k "$S3_URL_KERNEL_IMAGE" \ -lm "$S3_URL_LTTNG_MODULES" \ + -tu "$LTTNG_TOOLS_REPO" \ + -uu "$LTTNG_UST_REPO" \ -tc "$LTTNG_TOOLS_COMMIT_ID" \ -uc "$LTTNG_UST_COMMIT_ID" \ -id "$BUILD_TAG" diff --git a/scripts/system-tests/run-kvm-fuzzing-tests.sh b/scripts/system-tests/run-kvm-fuzzing-tests.sh index 8ab8a6c..a1b5c54 100644 --- a/scripts/system-tests/run-kvm-fuzzing-tests.sh +++ b/scripts/system-tests/run-kvm-fuzzing-tests.sh @@ -29,6 +29,8 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \ -j "$JOB_NAME" \ -k "$S3_URL_KERNEL_IMAGE" \ -lm "$S3_URL_LTTNG_MODULES" \ + -tu "$LTTNG_TOOLS_REPO" \ + -uu "$LTTNG_UST_REPO" \ -tc "$LTTNG_TOOLS_COMMIT_ID" \ -uc "$LTTNG_UST_COMMIT_ID" \ -id "$BUILD_TAG" diff --git a/scripts/system-tests/run-kvm-tests.sh b/scripts/system-tests/run-kvm-tests.sh index cdcd42f..16fc925 100644 --- a/scripts/system-tests/run-kvm-tests.sh +++ b/scripts/system-tests/run-kvm-tests.sh @@ -29,6 +29,8 @@ python -u "$LTTNG_CI_PATH"/scripts/system-tests/lava2-submit.py \ -j "$JOB_NAME" \ -k "$S3_URL_KERNEL_IMAGE" \ -lm "$S3_URL_LTTNG_MODULES" \ + -tu "$LTTNG_TOOLS_REPO" \ + -uu "$LTTNG_UST_REPO" \ -tc "$LTTNG_TOOLS_COMMIT_ID" \ -uc "$LTTNG_UST_COMMIT_ID" \ -id "$BUILD_TAG" -- 2.34.1