From 7e94286326f4ebc57b062d93ce8a53d55db14179 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 20 May 2016 11:45:42 -0400 Subject: [PATCH] lttng-modules: Multiple fixes Signed-off-by: Michael Jeanson --- jobs/lttng-modules.yaml | 35 ++++++--------------- scripts/common/coverity.sh | 4 +-- scripts/lttng-modules/build.sh | 4 +-- scripts/lttng-modules/master-rt.groovy | 4 ++- scripts/lttng-modules/master-ubuntu.groovy | 4 ++- scripts/lttng-modules/master-vanilla.groovy | 4 ++- 6 files changed, 22 insertions(+), 33 deletions(-) diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml index 4c0d6ad..8ecbaf1 100644 --- a/jobs/lttng-modules.yaml +++ b/jobs/lttng-modules.yaml @@ -27,7 +27,7 @@ shallow-clone: true skip-tag: true fastpoll: true - basedir: lttng-modules + basedir: src/lttng-modules triggers: - pollscm: @@ -60,7 +60,7 @@ target: 'deps/linux' do-not-fingerprint: true - shell: | - git clone --depth=1 -b "v{kversion}" --reference $HOME/gitcache/linux-stable.git/ git://artifacts.internal.efficios.com/git/linux-stable.git linux + git clone --depth=1 -b "v{kversion}" --reference $HOME/gitcache/linux-stable.git/ git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git src/linux - shell: !include-raw-escape: scripts/lttng-modules/build.sh @@ -99,7 +99,7 @@ description: 'The lowest kernel version to build.' - string: name: 'kgitrepo' - default: 'git://artifacts.internal.efficios.com/git/linux-stable.git' + default: 'git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git' description: 'The linux kernel git repository url.' - string: name: 'kbuildjob' @@ -143,7 +143,7 @@ description: 'The lowest kernel version to build.' - string: name: 'kgitrepo' - default: 'git://artifacts.internal.efficios.com/git/ubuntu-{uversion}.git' + default: 'git://git-mirror.internal.efficios.com/git/ubuntu-{uversion}.git' description: 'The linux kernel git repository url.' - string: name: 'kbuildjob' @@ -187,7 +187,7 @@ description: 'The lowest kernel version to build.' - string: name: 'kgitrepo' - default: 'git://artifacts.internal.efficios.com/git/linux-rt-devel.git' + default: 'git://git-mirror.internal.efficios.com/kernel/rt/linux-rt-devel.git' description: 'The linux kernel git repository url.' - string: name: 'kbuildjob' @@ -230,7 +230,7 @@ description: 'The linux kernel git tag to build against.' - string: name: 'kgitrepo' - default: 'git://artifacts.internal.efficios.com/git/linux-stable.git' + default: 'git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git' description: 'The linux kernel git repository url.' concurrent: true @@ -267,14 +267,6 @@ - pollscm: cron: "@daily" - scm: - - git: - url: git://github.com/lttng/lttng-modules.git - browser: githubweb - browser-url: https://github.com/lttng/lttng-modules - branches: - - "{mversion}" - wrappers: - workspace-cleanup - timestamps @@ -288,12 +280,11 @@ builders: - shell: | - git clone --depth=1 -b v4.4 --reference $HOME/gitcache/linux-stable.git/ git://artifacts.internal.efficios.com/git/linux-stable.git linux - cd linux + git clone --depth=1 -b v4.4 --reference $HOME/gitcache/linux-stable.git/ git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git src/linux + cd src/linux make defconfig sed -i "s/# CONFIG_KALLSYMS_ALL is not set/CONFIG_KALLSYMS_ALL=y/g" .config make modules_prepare - cd .. - shell: !include-raw-escape: scripts/common/coverity.sh @@ -308,18 +299,10 @@ - pollscm: cron: "@daily" - scm: - - git: - url: git://github.com/lttng/lttng-modules.git - browser: githubweb - browser-url: https://github.com/lttng/lttng-modules - branches: - - "{mversion}" - builders: - shell: | rm -f cppcheck.xml - cppcheck --enable=all --xml --xml-version=2 $WORKSPACE 2> cppcheck.xml + cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/lttng-modules 2> cppcheck.xml publishers: - archive: diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh index 37b23fc..89e0a2c 100755 --- a/scripts/common/coverity.sh +++ b/scripts/common/coverity.sh @@ -93,8 +93,8 @@ if [ -d "$WORKSPACE/deps/lttng-ust" ]; then export LD_LIBRARY_PATH="$UST_LIBS:${LD_LIBRARY_PATH:-}" fi -if [ -d "$WORKSPACE/linux" ]; then - export KERNELDIR="$WORKSPACE/linux" +if [ -d "$WORKSPACE/src/linux" ]; then + export KERNELDIR="$WORKSPACE/src/linux" fi diff --git a/scripts/lttng-modules/build.sh b/scripts/lttng-modules/build.sh index ad41890..a301c91 100755 --- a/scripts/lttng-modules/build.sh +++ b/scripts/lttng-modules/build.sh @@ -37,9 +37,9 @@ vergt() { # Use all CPU cores NPROC=$(nproc) -SRCDIR="${WORKSPACE}/lttng-modules" +SRCDIR="${WORKSPACE}/src/lttng-modules" BUILDDIR="${WORKSPACE}/build" -LNXSRCDIR="${WORKSPACE}/linux" +LNXSRCDIR="${WORKSPACE}/src/linux" LNXBINDIR="${WORKSPACE}/deps/linux/build" # Create build directory diff --git a/scripts/lttng-modules/master-rt.groovy b/scripts/lttng-modules/master-rt.groovy index 9d11387..177041d 100644 --- a/scripts/lttng-modules/master-rt.groovy +++ b/scripts/lttng-modules/master-rt.groovy @@ -246,7 +246,9 @@ for (b in allBuilds) { def kernelStr = b.buildVariableResolver.resolve("kversion") println "${b.fullDisplayName} (${kernelStr}) completed with status ${b.result}" // Cleanup builds - b.delete() + try { + b.delete() + } catch (all) {} } // Mark this build failed if any child build has failed diff --git a/scripts/lttng-modules/master-ubuntu.groovy b/scripts/lttng-modules/master-ubuntu.groovy index 9f1869f..da5f1fa 100644 --- a/scripts/lttng-modules/master-ubuntu.groovy +++ b/scripts/lttng-modules/master-ubuntu.groovy @@ -177,7 +177,9 @@ for (b in allBuilds) { def kernelStr = b.buildVariableResolver.resolve("kversion") println "${b.fullDisplayName} (${kernelStr}) completed with status ${b.result}" // Cleanup builds - b.delete() + try { + b.delete() + } catch (all) {} } // Mark this build failed if any child build has failed diff --git a/scripts/lttng-modules/master-vanilla.groovy b/scripts/lttng-modules/master-vanilla.groovy index ea3222b..95b240e 100644 --- a/scripts/lttng-modules/master-vanilla.groovy +++ b/scripts/lttng-modules/master-vanilla.groovy @@ -265,7 +265,9 @@ for (b in allBuilds) { def kernelStr = b.buildVariableResolver.resolve("kversion") println "${b.fullDisplayName} (${kernelStr}) completed with status ${b.result}" // Cleanup builds - b.delete() + try { + b.delete() + } catch (all) {} } // Mark this build failed if any child build has failed -- 2.34.1