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

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index def1fe3..637a997 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -15,10 +15,7 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: -1
         numToKeep: 2
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
 
     wrappers:
       - workspace-cleanup
@@ -33,6 +30,7 @@
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
+          basedir: src/babeltrace
 
     triggers:
       - pollscm:
@@ -75,14 +73,14 @@
     # TODO: Scan for open tasks
     publishers:
       - tap:
-          results: 'tap/**/*.tap'
+          results: 'tap/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
           console-log-parsers:
             - 'GNU Make + GNU C Compiler (gcc)'
           total-thresholds:
-            failed:
+            unstable:
               total-all: 0
               total-high: 0
               total-normal: 0
@@ -101,26 +99,18 @@
     <<: *babeltrace_version_buildtype_anchor
     publishers:
       - tap:
-          results: 'tap/**/*.tap'
+          results: 'tap/**/*.log'
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
           console-log-parsers:
             - 'GNU Make + GNU C Compiler (gcc)'
           total-thresholds:
-            failed:
+            unstable:
               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
@@ -231,6 +221,42 @@
           notify-every-unstable-build: true
           send-to-individuals: false
 
+# Use - in version number since yaml anchor do not support dot
+- babeltrace_version_glib-2-22-5_anchor: &babeltrace_version_glib-2-22-5_anchor
+    name: 'babeltrace_version_glib_anchor'
+    defaults: babeltrace
+    node: 'x86-64'
+
+    builders:
+      - inject:
+          properties-content: |
+            LD_LIBRARY_PATH=$WORKSPACE/glib-2.22.5/BUILD_RESULT/lib
+            PKG_CONFIG_PATH=$WORKSPACE/glib-2.22.5/BUILD_RESULT/lib/pkgconfig
+            arch=x86-64
+            conf=std
+            build=std
+      - shell: |
+          wget http://ftp.gnome.org/pub/gnome/sources/glib/2.22/glib-2.22.5.tar.gz
+          tar xvf glib-2.22.5.tar.gz
+          cd glib-2.22.5
+          mkdir BUILD_RESULT
+          ./configure --prefix=$WORKSPACE/glib-2.22.5/BUILD_RESULT
+          make -j `nproc`
+          make install
+
+      - shell:
+         !include-raw-escape: scripts/babeltrace/build.sh
+
+- job-template:
+    name: babeltrace_{version}_glib-2.22.5
+    triggers:
+      - pollscm:
+          cron: "@daily"
+    <<: *babeltrace_version_glib-2-22-5_anchor
+
+- job-template:
+    name: dev_{user}_babeltrace_{version}_glib-2.22.5
+    <<: *babeltrace_version_glib-2-22-5_anchor
 
 ## Project
 - project:
@@ -245,6 +271,11 @@
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: clangbuild
+          arch: !!python/tuple [x86-32, x86-64]
+          build: !!python/tuple [clang]
+          conf: !!python/tuple [std, static]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
@@ -258,11 +289,26 @@
           version:
             - stable-1.3
             - master
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: macosxbuild
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static]
+          version:
+            - master
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
       - 'babeltrace_{version}_pylint'
       - 'babeltrace_{version}_coverity':
           version: master
+      - 'babeltrace_{version}_glib-2.22.5':
+          version: master
+      - 'dev_{user}_babeltrace_{version}_glib-2.22.5':
+          user: jgalar
+          github_user: jgalar
+          github_name: babeltrace
+          version:
+            - master-staging
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
           user: jgalar
           github_user: jgalar