X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=1e333aea4be62ea8c71ccb903f54068a123dd040;hb=c2fe03a00e655f2415d4feea61d42a485f710eca;hp=d30974c3ef15b21d066a0c8a64264115b9387b5c;hpb=ef63064fd40c71fa23ea36a9121d06936b361add;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index d30974c..1e333ae 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
@@ -28,9 +25,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,12 +37,13 @@
 
     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
@@ -68,6 +66,9 @@
       - shell:
          !include-raw-escape: scripts/babeltrace/build.sh
 
+- job-template:
+    name: babeltrace_{version}_{buildtype}
+    <<: *babeltrace_version_buildtype_anchor
     # TODO: Scan for open tasks
     publishers:
       - tap:
@@ -78,11 +79,11 @@
           console-log-parsers:
             - 'GNU Make + GNU C Compiler (gcc)'
           total-thresholds:
-            failed:
-              total-all: 0
-              total-high: 0
-              total-normal: 0
-              total-low: 0
+            unstable:
+              total-all: 1
+              total-high: 1
+              total-normal: 1
+              total-low: 1
       - archive:
           artifacts: 'build/**'
           allow-empty: false
@@ -92,6 +93,24 @@
           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:
+            unstable:
+              total-all: 1
+              total-high: 1
+              total-normal: 1
+              total-low: 1
+
 - job-template:
     name: babeltrace_{version}_cppcheck
     defaults: babeltrace
@@ -201,10 +220,48 @@
           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:
     name: babeltrace
+    github_user: efficios
+    github_name: babeltrace
     version:
       !include: jobs/inc/babeltrace-versions.yaml.inc
     jobs:
@@ -231,4 +288,24 @@
       - '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
+          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]