X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=3ea1eaa3e543a563f2c8929aa4d994bed5c97ad8;hb=2041dd285e93ae142b8df7dc225793d3101ce261;hp=333c4f4cd267fc346cdee66d0d9ce854f53bed41;hpb=890bff2382ecd077d009f4315ca2233c0f6f31cd;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 333c4f4..3ea1eaa 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -23,22 +23,24 @@
     wrappers:
       - workspace-cleanup
       - timestamps
-      - ansicolor
+      - ansicolor:
+          colormap: xterm
 
     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}
 
     triggers:
-      - pollscm: "@hourly"
+      - pollscm:
+          cron: "@hourly"
 
     properties:
       - github:
-          url: https://github.com/efficios/babeltrace/
+          url: https://github.com/efficios/babeltrace
 
 
 ## Templates
@@ -47,6 +49,7 @@
     defaults: babeltrace
 
     project-type: matrix
+    node: 'x86-32 || x86-64' # Applies only to matrix flyweight task
     axes:
       - axis:
          type: slave
@@ -62,10 +65,7 @@
       - axis:
          type: user-defined
          name: build
-         values:
-          - std
-          - oot
-          - dist
+         values: '{obj:build}'
 
     builders:
       - shell:
@@ -88,14 +88,14 @@
       - archive:
           artifacts: 'build/**'
           allow-empty: false
-          fingerprint: true
 
 - job-template:
     name: babeltrace_{version}_cppcheck
     defaults: babeltrace
 
     triggers:
-      - pollscm: "@daily"
+      - pollscm:
+          cron: "@daily"
 
     builders:
       - shell: |
@@ -106,7 +106,6 @@
       - archive:
           artifacts: 'babeltrace-cppcheck.xml'
           allow-empty: false
-          fingerprint: true
       - cppcheck:
           pattern: 'babeltrace-cppcheck.xml'
       - email:
@@ -120,7 +119,8 @@
     node: 'x86-64'
 
     triggers:
-      - pollscm: "@daily"
+      - pollscm:
+          cron: "@daily"
 
     builders:
       - shell:
@@ -132,24 +132,31 @@
           dir: 'scan-build-archive/'
           files: 'index.html'
 
-# TODO: babeltrace_{version}_coverity
-#- job-template:
-#    name: babeltrace_{version}_coverity
-#    defaults: babeltrace
-#    node: 'x86-64'
-#
-#    triggers:
-#      - pollscm: "@daily"
-#
-#    builders:
-#      - shell:
-#          !include-raw-escape scripts/babeltrace/coverity.sh
-#
-#    publishers:
-#      - html-publisher:
-#          name: 'HTML Report'
-#          dir: 'scan-build-archive/'
-#          files: 'index.html'
+- job-template:
+    name: babeltrace_{version}_coverity
+    defaults: babeltrace
+    node: 'x86-64'
+
+    triggers:
+      - pollscm:
+          cron: "@daily"
+
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor:
+          colormap: xterm
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: babeltrace_coverity_token
+              username: COVERITY_SCAN_PROJECT_NAME
+              password: COVERITY_SCAN_TOKEN
+    builders:
+      - shell:
+          !include-raw-escape scripts/common/coverity.sh
+
+    publishers:
+      - workspace-cleanup
 
 - job-template:
     name: babeltrace_{version}_pylint
@@ -159,7 +166,8 @@
     scm: []
 
     triggers:
-      - pollscm: "@daily"
+      - pollscm:
+          cron: "@daily"
 
     builders:
        - copyartifact:
@@ -167,14 +175,13 @@
            which-build: last-successful
            stable: true
            filter: 'build/**'
-           target: 'dependencies/babeltrace'
+           target: 'deps/babeltrace'
        - shell:
           !include-raw-escape scripts/babeltrace/pylint.sh
 
     publishers:
       - archive:
           artifacts: 'pep8.out,pylint.out'
-          fingerprint: true
       - violations:
           pep8:
             pattern: pep8.out
@@ -192,31 +199,23 @@
           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'
+      - 'babeltrace_{version}_coverity':
+          version: master