jjb: lava: use Jenkins' Git plugin to checkout projects rather than doing manual...

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 1dedd47a09bc769786eed1aab01d2c9babcc154f..b7a0fcc1694cbc038dfdd4250f330b49f6541c41 100644 (file)
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -95,6 +95,10 @@
       - inject:
           properties-content: |
             BUILD_DEVICE=baremetal
+    scm:
+      - git:
+          url: https://github.com/lttng/lttng-ci
+          basedir: src/lttng-ci/
 
     builders:
       - shell: !include-raw-escape: scripts/system-tests/generate-properties-master.sh
@@ -148,6 +152,11 @@
           properties-content: |
             BUILD_DEVICE=kvm
 
+    scm:
+      - git:
+          url: https://github.com/lttng/lttng-ci
+          basedir: src/lttng-ci/
+
     builders:
       - shell: !include-raw-escape: scripts/system-tests/generate-properties-master.sh
       - trigger-builds:
@@ -190,6 +199,11 @@
           properties-content: |
             BUILD_DEVICE=kvm
 
+    scm:
+      - git:
+          url: https://github.com/lttng/lttng-ci
+          basedir: src/lttng-ci/
+
     builders:
       - shell: !include-raw-escape: scripts/system-tests/generate-properties-master.sh
       - trigger-builds:
@@ -233,6 +247,11 @@
           properties-content: |
             BUILD_DEVICE=baremetal
 
+    scm:
+      - git:
+          url: https://github.com/lttng/lttng-ci
+          basedir: src/lttng-ci/
+
     builders:
       - shell: !include-raw-escape: scripts/system-tests/generate-properties-master.sh
       - trigger-builds:
@@ -297,6 +316,21 @@
               credential-id: system_tests_storage_key
               variable: identity_file
 
+    scm:
+      - git:
+          url: https://github.com/lttng/lttng-ci
+          basedir: src/lttng-ci/
+      - git:
+          url : $KGITREPO
+          basedir: src/linux/
+          branches:
+            - $KERNEL_COMMIT_ID
+      - git:
+          url : $LTTNG_MODULES_REPO
+          basedir: src/lttng-modules/
+          branches:
+            - $LTTNG_MODULES_COMMIT_ID
+
     builders:
       - shell: !include-raw-escape: scripts/system-tests/generate-properties-slave.sh
       - inject:

diff --git a/scripts/system-tests/check-build-needs.sh b/scripts/system-tests/check-build-needs.sh
index 625047e7943b74a4e3b791e6d3852a2b8c3ecba9..162a7c47af1426a5f5a662749f71fe9b0d7272f4 100644 (file)
--- a/scripts/system-tests/check-build-needs.sh
+++ b/scripts/system-tests/check-build-needs.sh
@@ -37,17 +37,7 @@ set -e
 # kernel or modules
 if [ $NEED_MODULES_BUILD -eq 1 ] || [ $NEED_KERNEL_BUILD -eq 1 ] ; then
 
-  git clone "$KGITREPO" "$LINUX_PATH"
-  pushd "$LINUX_PATH"
-  git checkout "$KERNEL_COMMIT_ID"
-  popd
-  git clone "$LTTNG_MODULES_GIT" "$LTTNG_MODULES_PATH"
-  pushd "$LTTNG_MODULES_PATH"
-  git checkout "$LTTNG_MODULES_COMMIT_ID"
-  popd
-
-  git clone https://github.com/lttng/lttng-ci "$LTTNG_CI_PATH"
-  cp "$LTTNG_CI_PATH"/lava/kernel/vanilla/x86_64_server.config "$LINUX_PATH/.config"
+  cp src/lttng-ci/lava/kernel/vanilla/x86_64_server.config "$LINUX_PATH/.config"
   make --directory="$LINUX_PATH" olddefconfig
 
   if [ $BUILD_DEVICE = 'kvm' ] ; then

diff --git a/scripts/system-tests/generate-properties-master.sh b/scripts/system-tests/generate-properties-master.sh
index 733b6ede771987de49913f97ab13380a3c6a1efd..bb2e25b89502a977e1b5352c630c17b2a0fddcf6 100644 (file)
--- a/scripts/system-tests/generate-properties-master.sh
+++ b/scripts/system-tests/generate-properties-master.sh
@@ -16,13 +16,9 @@
 
 touch properties.txt
 
-KERNEL_COMMIT_ID=$kernel_tag_id
-LTTNG_MODULES_COMMIT_ID=$modules_commit_id
-LTTNG_TOOLS_COMMIT_ID=$tools_commit_id
-LTTNG_UST_COMMIT_ID=$ust_commit_id
-
 LTTNG_CI_PATH="$WORKSPACE/src/lttng-ci"
 echo "LTTNG_CI_PATH=$LTTNG_CI_PATH" >> properties.txt
+KERNEL_COMMIT_ID=$KERNEL_TAG_ID
 
 echo "KERNEL_COMMIT_ID=$KERNEL_COMMIT_ID" >> properties.txt
 echo "LTTNG_MODULES_COMMIT_ID=$LTTNG_MODULES_COMMIT_ID" >> properties.txt
@@ -36,8 +32,8 @@ echo "STORAGE_HOST=storage.internal.efficios.com" >> properties.txt
 echo "STORAGE_USER=jenkins-lava" >> properties.txt
 
 echo "BUILD_DEVICE=$BUILD_DEVICE" >> properties.txt
-echo "KGITREPO=$kernel_repo" >> properties.txt
+echo "KGITREPO=$KERNEL_REPO" >> properties.txt
 echo "STORAGE_KERNEL_FOLDER=$BASE_STORAGE_FOLDER/kernel" >> properties.txt
 echo "STORAGE_KERNEL_IMAGE=$BASE_STORAGE_FOLDER/kernel/$KERNEL_COMMIT_ID.$BUILD_DEVICE.bzImage" >> properties.txt
 echo "STORAGE_LINUX_MODULES=$BASE_STORAGE_FOLDER/modules/linux/$KERNEL_COMMIT_ID.$BUILD_DEVICE.linux.modules.tar.gz" >> properties.txt
-echo "STORAGE_LTTNG_MODULES=$BASE_STORAGE_FOLDER/modules/lttng/i$KERNEL_COMMIT_ID-$LTTNG_MODULES_COMMIT_ID.$BUILD_DEVICE.lttng.modules.tar.gz" >> properties.txt
+echo "STORAGE_LTTNG_MODULES=$BASE_STORAGE_FOLDER/modules/lttng/$KERNEL_COMMIT_ID-$LTTNG_MODULES_COMMIT_ID.$BUILD_DEVICE.lttng.modules.tar.gz" >> properties.txt

diff --git a/scripts/system-tests/generate-properties-slave.sh b/scripts/system-tests/generate-properties-slave.sh
index d82119ca9f025fd42161839e9ce10fa73c89beb0..426e3b50682e113dd6bb3597c6314982c2a65bfa 100644 (file)
--- a/scripts/system-tests/generate-properties-slave.sh
+++ b/scripts/system-tests/generate-properties-slave.sh
@@ -20,12 +20,10 @@ touch properties.txt
 NPROC=$(nproc)
 echo "NPROC=$NPROC" >> properties.txt
 
-LTTNG_CI_PATH="$WORKSPACE/src/lttng-ci"
 LINUX_PATH="$WORKSPACE/src/linux"
 LTTNG_MODULES_PATH="$WORKSPACE/src/lttng-modules"
 
 echo "LTTNG_MODULES_GIT=$LTTNG_MODULES_REPO" >> properties.txt
-echo "LTTNG_CI_PATH=$LTTNG_CI_PATH" >> properties.txt
 echo "LINUX_PATH=$LINUX_PATH" >> properties.txt
 echo "LTTNG_MODULES_PATH=$LTTNG_MODULES_PATH" >> properties.txt
 

diff --git a/scripts/system-tests/run-baremetal-benchmarks.sh b/scripts/system-tests/run-baremetal-benchmarks.sh
index aa6be86b41258b2a4b4e6bcaecf2becd31bc564c..227d3f543190279cff57f95aa102f73beb479339 100644 (file)
--- a/scripts/system-tests/run-baremetal-benchmarks.sh
+++ b/scripts/system-tests/run-baremetal-benchmarks.sh
@@ -16,9 +16,6 @@
 
 echo 'At this point, we built the modules and kernel if we needed to.'
 echo 'We can now launch the lava job using those artefacts'
-
-git clone https://github.com/lttng/lttng-ci "$LTTNG_CI_PATH"
-
 python3 -u "$LTTNG_CI_PATH"/scripts/lttng-baremetal-tests/lava-submit.py \
                           -t baremetal-benchmarks \
                           -j "$JOB_NAME" \

diff --git a/scripts/system-tests/run-baremetal-tests.sh b/scripts/system-tests/run-baremetal-tests.sh
index 2f9eee84840009bcb72591bc7cb3766d56e03ad2..62dcd51c1ea70bdc4648350ac3eda213de0643bf 100644 (file)
--- a/scripts/system-tests/run-baremetal-tests.sh
+++ b/scripts/system-tests/run-baremetal-tests.sh
@@ -16,8 +16,6 @@
 
 echo 'At this point, we built the modules and kernel if we needed to.'
 echo 'We can now launch the lava job using those artefacts'
-git clone https://github.com/lttng/lttng-ci "$LTTNG_CI_PATH"
-
 python3 -u "$LTTNG_CI_PATH"/scripts/lttng-baremetal-tests/lava-submit.py \
                           -t baremetal-tests \
                           -j "$JOB_NAME" \

diff --git a/scripts/system-tests/run-kvm-fuzzing-tests.sh b/scripts/system-tests/run-kvm-fuzzing-tests.sh
index a7ba525c7119afef635f8f72d14cfadd8a44fa2f..b8dc899d75b540bf3f9745916746c54bdc545753 100644 (file)
--- a/scripts/system-tests/run-kvm-fuzzing-tests.sh
+++ b/scripts/system-tests/run-kvm-fuzzing-tests.sh
@@ -16,8 +16,6 @@
 
 echo 'At this point, we built the modules and kernel if we needed to.'
 echo 'We can now launch the lava job using those artefacts'
-git clone https://github.com/lttng/lttng-ci "$LTTNG_CI_PATH"
-
 python3 -u "$LTTNG_CI_PATH"/scripts/lttng-baremetal-tests/lava-submit.py \
                           -t kvm-fuzzing-tests \
                           -j "$JOB_NAME" \

diff --git a/scripts/system-tests/run-kvm-tests.sh b/scripts/system-tests/run-kvm-tests.sh
index 05eb6933708b71fd7e96e8bf3fcbb837cf0d994c..c1100fcd5445785d4fcf1807f1c536c2cc081b0b 100644 (file)
--- a/scripts/system-tests/run-kvm-tests.sh
+++ b/scripts/system-tests/run-kvm-tests.sh
@@ -16,8 +16,6 @@
 
 echo 'At this point, we built the modules and kernel if we needed to.'
 echo 'We can now launch the lava job using those artefacts'
-git clone https://github.com/lttng/lttng-ci "$LTTNG_CI_PATH"
-
 python3 -u "$LTTNG_CI_PATH"/scripts/lttng-baremetal-tests/lava-submit.py \
                           -t kvm-tests \
                           -j "$JOB_NAME" \