From 7b37c13267fa4bedd404702f554328550ad792d0 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 11 Jul 2022 16:36:36 -0400 Subject: [PATCH] jjb: babeltrace-benchmark: deprecate Multi-SCM plugin The Multi-SCM plugin is deprecated and breaks recent Jenkins job configuration UI. Replace its use by scripts. Change-Id: I87f689dc8f3f4275a5ca5a1bb34eea4112cd67f5 Signed-off-by: Michael Jeanson --- jobs/babeltrace-benchmark.yaml | 19 ++++--------------- scripts/babeltrace-benchmark/benchmark.sh | 5 +++++ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/jobs/babeltrace-benchmark.yaml b/jobs/babeltrace-benchmark.yaml index c3c7d85..309f5da 100644 --- a/jobs/babeltrace-benchmark.yaml +++ b/jobs/babeltrace-benchmark.yaml @@ -27,6 +27,7 @@ triggers: - timed: '@daily' + builders: - shell: !include-raw: scripts/babeltrace-benchmark/benchmark.sh @@ -35,12 +36,10 @@ - archive: artifacts: 'results/**' allow-empty: false - scm: - - babeltrace - - lttng-ci + - workspace-cleanup: + clean-if: + - failure: false -- scm: - name: babeltrace scm: - git: url: https://github.com/efficios/babeltrace.git @@ -48,13 +47,3 @@ browser-url: https://github.com/efficios/babeltrace basedir: src/babeltrace skip-tag: true -- scm: - name: lttng-ci - scm: - - git: - url: https://github.com/lttng/lttng-ci.git - browser: githubweb - browser-url: https://github.com/lttng/lttng-ci - basedir: src/lttng-ci - skip-tag: true - diff --git a/scripts/babeltrace-benchmark/benchmark.sh b/scripts/babeltrace-benchmark/benchmark.sh index 57a788f..9a3256b 100755 --- a/scripts/babeltrace-benchmark/benchmark.sh +++ b/scripts/babeltrace-benchmark/benchmark.sh @@ -29,6 +29,10 @@ TMPDIR="${VENV}/tmp" mkdir -p "$TMPDIR" export TMPDIR +function checkout_scripts() { + git clone https://github.com/lttng/lttng-ci.git "$SCRIPT_DIR" +} + function setup_env () { mkdir -p "$RESULTS_DIR" @@ -50,6 +54,7 @@ function generate_report () python "$SCRIPT_PATH" --generate-report --repo-path "$SRC_DIR" --report-name "${RESULTS_DIR}/babeltrace-benchmark.pdf" } +checkout_scripts setup_env run_jobs generate_report -- 2.34.1