From 1edbbf45abc339c86a7b1d4b813b39c2eaed37d1 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Fri, 27 Jan 2017 00:09:34 -0500 Subject: [PATCH] jjb: Make system tests mainline jobs track Linus' tree instead of stable Signed-off-by: Francis Deslauriers --- jobs/lttng-baremetal-tests.yaml | 6 +++--- scripts/lttng-baremetal-tests/generate-properties-master.sh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) 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 -- 2.34.1