From 7bacdf9e26fcf3f8dc8b33768278e266df27cb2c Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 11 Jul 2022 17:36:41 -0400 Subject: [PATCH] jjb: system-tests: deprecate Multi-SCM plugin The Multi-SCM plugin is deprecated and breaks recent Jenkins job configuration UI. Replace its use by scripts. Change-Id: I378076811cf1b448d3bbed466b950bee4b8e0046 Signed-off-by: Michael Jeanson --- jobs/system-tests.yaml | 6 +----- scripts/system-tests/checkout-modules.sh | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100755 scripts/system-tests/checkout-modules.sh diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml index 4eeded8..ee48c82 100644 --- a/jobs/system-tests.yaml +++ b/jobs/system-tests.yaml @@ -252,13 +252,9 @@ - git: url: https://github.com/lttng/lttng-ci basedir: src/lttng-ci/ - - git: - url : $LTTNG_MODULES_REPO - basedir: src/lttng-modules/ - branches: - - $LTTNG_MODULES_COMMIT_ID builders: + - shell: !include-raw-escape: scripts/system-tests/checkout-modules.sh - shell: !include-raw-escape: scripts/system-tests/generate-properties-slave.sh - inject: properties-file: properties.txt diff --git a/scripts/system-tests/checkout-modules.sh b/scripts/system-tests/checkout-modules.sh new file mode 100755 index 0000000..9a8442b --- /dev/null +++ b/scripts/system-tests/checkout-modules.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# Copyright (C) 2022 Michael Jeanson +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set -exu + +git clone "$LTTNG_MODULES_REPO" src/lttng-modules && \ + cd src/lttng-modules && \ + git reset --hard "$LTTNG_MODULES_COMMIT_ID" -- 2.34.1