Use git protocol instead of https

[lttng-ci.git] / jobs / babeltrace.yaml

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 333c4f4cd267fc346cdee66d0d9ce854f53bed41..659a45a3f8d40d13f32dfadc8dfd131db85de8a2 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -27,9 +27,9 @@
 
     scm:
       - git:
-          url: https://github.com/efficios/babeltrace.git
+          url: git://github.com/efficios/babeltrace.git
           browser: githubweb
-          browser-url: https://github.com/efficios/babeltrace.git
+          browser-url: https://github.com/efficios/babeltrace
           branches:
             - origin/{version}
 
@@ -38,7 +38,7 @@
 
     properties:
       - github:
-          url: https://github.com/efficios/babeltrace/
+          url: https://github.com/efficios/babeltrace
 
 
 ## Templates
@@ -47,6 +47,7 @@
     defaults: babeltrace
 
     project-type: matrix
+    node: 'x86-32 || x86-64' # Applies only to matrix flyweight task
     axes:
       - axis:
          type: slave
@@ -62,10 +63,7 @@
       - axis:
          type: user-defined
          name: build
-         values:
-          - std
-          - oot
-          - dist
+         values: '{obj:build}'
 
     builders:
       - shell:
@@ -88,7 +86,6 @@
       - archive:
           artifacts: 'build/**'
           allow-empty: false
-          fingerprint: true
 
 - job-template:
     name: babeltrace_{version}_cppcheck
@@ -106,7 +103,6 @@
       - archive:
           artifacts: 'babeltrace-cppcheck.xml'
           allow-empty: false
-          fingerprint: true
       - cppcheck:
           pattern: 'babeltrace-cppcheck.xml'
       - email:
@@ -174,7 +170,6 @@
     publishers:
       - archive:
           artifacts: 'pep8.out,pylint.out'
-          fingerprint: true
       - violations:
           pep8:
             pattern: pep8.out
@@ -192,30 +187,20 @@
           send-to-individuals: false
 
 
-## Job groups
-- job-group:
-    name: 'babeltrace_{version}_build'
-    buildtype: 'build'
-    jobs:
-      - 'babeltrace_{version}_{buildtype}'
-
-- job-group:
-    name: 'babeltrace_{version}_portbuild'
-    buildtype: 'portbuild'
-    jobs:
-      - 'babeltrace_{version}_{buildtype}'
-
 ## Project
 - project:
     name: babeltrace
     version:
-      - stable-1.2
-      - master
+      !include jobs/inc/babeltrace-versions.yaml.inc
     jobs:
-      - 'babeltrace_{version}_build':
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: build
           arch: !!python/tuple [x86-32, x86-64]
-      - 'babeltrace_{version}_portbuild':
+          build: !!python/tuple [std, oot, dist]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: portbuild
           arch: !!python/tuple [armhf, powerpc]
+          build: !!python/tuple [std]
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
       - 'babeltrace_{version}_pylint'