jjb: fix all the kernel builds

[lttng-ci.git] / jobs / lttng-scope.yml

diff --git a/jobs/lttng-scope.yml b/jobs/lttng-scope.yml
index 7edfd504b0b1bc3df7a7fab8c2e47cbb7fe35d42..ade281eccb1d8056a56ff52788f9613cbdb450a3 100644 (file)
--- a/jobs/lttng-scope.yml
+++ b/jobs/lttng-scope.yml
@@ -14,9 +14,9 @@
 
     scm:
       - git:
-          url: git://github.com/{github_user}/{github_name}.git
+          url: https://github.com/{github_user}/{github_project}.git
           browser: githubweb
-          browser-url: https://github.com/{github_user}/{github_name}
+          browser-url: https://github.com/{github_user}/{github_project}
           branches:
             - origin/{version}
           skip-tag: true
@@ -28,9 +28,7 @@
 
     properties:
       - build-discarder:
-          num-to-keep: 7
-      - github:
-          url: https://github.com/{github_user}/{github_name}
+          num-to-keep: 2
 
 
 ## Templates
@@ -73,8 +71,6 @@
           goals: clean install -Dmaven.test.skip=false
           private-repository: true
           settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-          properties:
-            - maven.test.failure.ignore=true
 
     publishers:
       - archive:
@@ -157,9 +153,9 @@
 
     scm:
       - git:
-          url: git://github.com/{github_user}/{github_name}.git
+          url: https://github.com/{github_user}/{github_project}.git
           browser: githubweb
-          browser-url: https://github.com/{github_user}/{github_name}
+          browser-url: https://github.com/{github_user}/{github_project}
           branches:
             - origin/{version}
           skip-tag: true
@@ -180,8 +176,6 @@
           goals: clean install -Dmaven.test.skip=false
           private-repository: true
           settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-          properties:
-            - maven.test.failure.ignore=true
 
     publishers:
       - archive:
@@ -284,8 +278,6 @@
           goals: clean install -Dmaven.test.skip=false
           private-repository: true
           settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig277b7a2d-b7a6-4ae4-a32d-18c02514e9e4'
-          properties:
-            - maven.test.failure.ignore=true
 
     publishers:
       - archive:
@@ -357,7 +349,7 @@
 - job-template:
     name: lttng-scope_{version}_coverity
     defaults: lttng-scope
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -376,9 +368,9 @@
 
     scm:
       - git:
-          url: git://github.com/{github_user}/{github_name}.git
+          url: https://github.com/{github_user}/{github_project}.git
           browser: githubweb
-          browser-url: https://github.com/{github_user}/{github_name}
+          browser-url: https://github.com/{github_user}/{github_project}
           branches:
             - origin/{version}
           skip-tag: true
@@ -404,14 +396,14 @@
 - project:
     name: lttng-scope
     github_user: lttng
-    github_name: lttng-scope
-    email_to: 'ci-notification@lists.lttng.org, cc:alexmonthy@efficios.com'
-    email_for_all_failure: 'alexmonthy@efficios.com'
+    github_project: lttng-scope
+    email_to: 'ci-notification@lists.lttng.org, cc:pproulx@efficios.com'
+    email_for_all_failure: 'pproulx@efficios.com'
     version:
       - master
     jobs:
       - 'lttng-scope_{version}_build':
-          arch: !!python/tuple [x86-32, x86-64]
+          arch: !!python/tuple [i386, amd64]
       - 'lttng-scope_{version}_winbuild':
           arch: !!python/tuple [win64]
       - 'lttng-scope_{version}_macosxbuild':