lttng-modules: Multiple fixes

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 4c0d6ade09253f09252c972442cd9464cf429ec6..8ecbaf16cc8b626da886999e0d720c761f951113 100644 (file)
--- 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 37b23fc69f4bbb0a72c5bf06600736b608b7ee6d..89e0a2c0a409818ea7c678476f12f3e455d64292 100755 (executable)
--- 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 ad4189030ddf7e6a4d643f19f70f2034d40db0d6..a301c918a85c1c82828f4ff9bf0c55ae847225c1 100755 (executable)
--- 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 9d11387e2a43978dd282a71deea01fa6b4a22a8f..177041db8ebfb2590154a24f939ff2db4813c3cb 100644 (file)
--- 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 9f1869fab3dd98f35b34acf74e2511c24f3b6851..da5f1fa8ebeea53b55f456fdc05247f1994460a2 100644 (file)
--- 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 ea3222b936b2182b921125ec129bf48f634a987a..95b240e755c0a3b10f7a9c8641be3cb98f19e201 100644 (file)
--- 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