X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=def1fe33c4841fab2363b98d14f1f51820dc72e9;hb=4f827afb892fc28209d4c69b4f22ecdd3390fc6e;hp=509cd1dbf3c89a48eec79f442ae34a85cc61f251;hpb=1f6ad2ae0c9ceb3fc5d5918b3c3e952ee4ffe266;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 509cd1d..def1fe3 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -28,9 +28,9 @@
 
     scm:
       - git:
-          url: git://github.com/efficios/babeltrace.git
+          url: git://github.com/{github_user}/{github_name}.git
           browser: githubweb
-          browser-url: https://github.com/efficios/babeltrace
+          browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
 
@@ -40,16 +40,17 @@
 
     properties:
       - github:
-          url: https://github.com/efficios/babeltrace
+          url: https://github.com/{github_user}/{github_name}
 
 
 ## Templates
-- job-template:
-    name: babeltrace_{version}_{buildtype}
+
+- babeltrace_version_buildtype_anchor: &babeltrace_version_buildtype_anchor
+    name: 'babeltrace_version_buildtype_anchor'
     defaults: babeltrace
 
     project-type: matrix
-    node: 'x86-32 || x86-64' # Applies only to matrix flyweight task
+    node: 'master' # Applies only to matrix flyweight task
     axes:
       - axis:
          type: slave
@@ -58,10 +59,7 @@
       - axis:
          type: user-defined
          name: conf
-         values:
-          - std
-          - static
-          - python_bindings
+         values: '{obj:conf}'
       - axis:
          type: user-defined
          name: build
@@ -69,13 +67,17 @@
 
     builders:
       - shell:
-         !include-raw-escape scripts/babeltrace/build.sh
+         !include-raw-escape: scripts/babeltrace/build.sh
 
+- job-template:
+    name: babeltrace_{version}_{buildtype}
+    <<: *babeltrace_version_buildtype_anchor
     # TODO: Scan for open tasks
     publishers:
       - tap:
           results: 'tap/**/*.tap'
           failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
       - warnings:
           console-log-parsers:
             - 'GNU Make + GNU C Compiler (gcc)'
@@ -89,10 +91,37 @@
           artifacts: 'build/**'
           allow-empty: false
       - ircbot:
+          strategy: new-failure-and-fixed
           matrix-notifier: only-parent
           channels:
             - name: '#lttng'
 
+- job-template:
+    name: dev_{user}_babeltrace_{version}_{buildtype}
+    <<: *babeltrace_version_buildtype_anchor
+    publishers:
+      - tap:
+          results: 'tap/**/*.tap'
+          failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
+      - warnings:
+          console-log-parsers:
+            - 'GNU Make + GNU C Compiler (gcc)'
+          total-thresholds:
+            failed:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+      - ircbot:
+          strategy: new-failure-and-fixed
+          notify-committers: True
+          notify-fixers: True
+
+          matrix-notifier: only-configurations
+          channels:
+            - name: '#lttng'
+
 - job-template:
     name: babeltrace_{version}_cppcheck
     defaults: babeltrace
@@ -128,7 +157,7 @@
 
     builders:
       - shell:
-          !include-raw-escape scripts/babeltrace/scan-build.sh
+          !include-raw-escape: scripts/babeltrace/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -157,7 +186,7 @@
               password: COVERITY_SCAN_TOKEN
     builders:
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -175,13 +204,13 @@
 
     builders:
        - copyartifact:
-           project: babeltrace-{version}/arch=x86-64,build=std,conf=python_bindings
+           project: babeltrace_{version}_build/arch=x86-64,build=std,conf=python-bindings
            which-build: last-successful
            stable: true
            filter: 'build/**'
            target: 'deps/babeltrace'
        - shell:
-          !include-raw-escape scripts/babeltrace/pylint.sh
+          !include-raw-escape: scripts/babeltrace/pylint.sh
 
     publishers:
       - archive:
@@ -206,20 +235,44 @@
 ## Project
 - project:
     name: babeltrace
+    github_user: efficios
+    github_name: babeltrace
     version:
-      !include jobs/inc/babeltrace-versions.yaml.inc
+      !include: jobs/inc/babeltrace-versions.yaml.inc
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
+          conf: !!python/tuple [std, static, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: portbuild
-          arch: !!python/tuple [armhf, powerpc]
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static, python-bindings]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: solarisbuild
+          arch: !!python/tuple [solaris10, solaris11]
           build: !!python/tuple [std]
+          conf: !!python/tuple [std, static]
+          version:
+            - stable-1.3
+            - master
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
       - 'babeltrace_{version}_pylint'
       - 'babeltrace_{version}_coverity':
           version: master
+      - 'dev_{user}_babeltrace_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: babeltrace
+          buildtype: build
+          version:
+            - master-staging
+            - stable-1.2-staging
+            - stable-1.3-staging
+          arch: !!python/tuple [x86-32, x86-64]
+          build: !!python/tuple [std, oot, dist]
+          conf: !!python/tuple [std, static, python-bindings]