From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Fri, 27 Jan 2017 05:09:34 +0000 (-0500)
Subject: jjb: Make system tests mainline jobs track Linus' tree instead of stable
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1edbbf45abc339c86a7b1d4b813b39c2eaed37d1;p=lttng-ci.git

jjb: Make system tests mainline jobs track Linus' tree instead of stable

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

diff --git a/jobs/lttng-baremetal-tests.yaml b/jobs/lttng-baremetal-tests.yaml
index c031279..0506da6 100644
--- a/jobs/lttng-baremetal-tests.yaml
+++ b/jobs/lttng-baremetal-tests.yaml
@@ -287,7 +287,7 @@
           fastpoll: true
           basedir: src/lttng-modules
       - git:
-          url: git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git
+          url: git://git-mirror.internal.efficios.com/kernel/torvalds/linux.git
           refspec: "+refs/tags/*:refs/remotes/origin/tags/*"
           branches:
             - "master"
@@ -318,7 +318,7 @@
           fastpoll: true
           basedir: src/lttng-modules
       - git:
-          url: git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git
+          url: git://git-mirror.internal.efficios.com/kernel/torvalds/linux.git
           refspec: "+refs/tags/*:refs/remotes/origin/tags/*"
           branches:
             - "master"
@@ -349,7 +349,7 @@
           fastpoll: true
           basedir: src/lttng-modules
       - git:
-          url: git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git
+          url: git://git-mirror.internal.efficios.com/kernel/torvalds/linux.git
           refspec: "+refs/tags/*:refs/remotes/origin/tags/*"
           branches:
             - "master"
diff --git a/scripts/lttng-baremetal-tests/generate-properties-master.sh b/scripts/lttng-baremetal-tests/generate-properties-master.sh
index ba35de0..d344ab4 100644
--- a/scripts/lttng-baremetal-tests/generate-properties-master.sh
+++ b/scripts/lttng-baremetal-tests/generate-properties-master.sh
@@ -55,7 +55,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=git://git-mirror.internal.efficios.com/git/linux-stable.git" >> properties.txt
+KGITREPO=$(git --git-dir="$LINUX_PATH"/.git/ remote get-url origin)
+echo "KGITREPO=$KGITREPO" >> properties.txt
 echo "STORAGE_KERNEL_FOLDER=$BASE_STORAGE_FOLDER/kernel" >> properties.txt
 echo "STORAGE_KERNEL_IMAGE=$BASE_STORAGE_FOLDER/kernel/$KERNEL_VERSION-$KERNEL_COMMIT_ID.$BUILD_DEVICE.bzImage" >> properties.txt
 echo "STORAGE_LINUX_MODULES=$BASE_STORAGE_FOLDER/modules/linux/$KERNEL_VERSION-$KERNEL_COMMIT_ID.$BUILD_DEVICE.linux.modules.tar.gz" >> properties.txt