X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=8e526d5b38aade91ba2b62980277169125b6aefa;hb=944a6c86f6eab1c0b3d65c2f3f771764851baf05;hp=fdb6f29651c294afba29e4221bdfea85f295c1c7;hpb=06264d10d51edebfa679449b3e0ef27f4048d733;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index fdb6f29..8e526d5 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -14,12 +14,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: -1
-        numToKeep: 2
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -28,19 +22,23 @@
 
     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}
+          basedir: src/babeltrace
+          skip-tag: true
 
     triggers:
       - pollscm:
           cron: "@hourly"
 
     properties:
+      - build-discarder:
+          num-to-keep: 2
       - github:
-          url: https://github.com/efficios/babeltrace
+          url: https://github.com/{github_user}/{github_name}
 
 
 ## Templates
@@ -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
@@ -96,6 +94,24 @@
           channels:
             - name: '#lttng'
 
+- job-template:
+    name: dev_{user}_babeltrace_{version}_{buildtype}
+    <<: *babeltrace_version_buildtype_anchor
+    publishers:
+      - 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:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
+
 - job-template:
     name: babeltrace_{version}_cppcheck
     defaults: babeltrace
@@ -107,7 +123,7 @@
     builders:
       - shell: |
           rm -f babeltrace-cppcheck.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE 2> babeltrace-cppcheck.xml
+          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/babeltrace 2> babeltrace-cppcheck.xml
 
     publishers:
       - archive:
@@ -164,6 +180,9 @@
 
     publishers:
       - workspace-cleanup
+      - archive:
+          artifacts: 'analysis-results.tgz,cov-int/**'
+          allow-empty: false
 
 - job-template:
     name: babeltrace_{version}_pylint
@@ -205,18 +224,63 @@
           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
+      - stable-1.3
+      - stable-1.4
+      - master
     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: 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]
@@ -227,12 +291,37 @@
           arch: !!python/tuple [solaris10, solaris11]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: macosxbuild
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static]
           version:
-            - stable-1.3
+            - stable-1.4
             - 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
+          github_name: babeltrace
+          buildtype: build
+          version:
+            - master-staging
+            - stable-1.3-staging
+            - stable-1.4-staging
+          arch: !!python/tuple [x86-32, x86-64]
+          build: !!python/tuple [std, oot, dist]
+          conf: !!python/tuple [std, static, python-bindings]