jjb: Update babeltrace jobs

[lttng-ci.git] / jobs / babeltrace.yaml

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 42c0f22fba40b20fdea4498ecbe8803dee3f46dd..09ddfeb9efe38b4a5a6972ca3b40482191ff469a 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -34,7 +34,6 @@
             - origin/{version}
           basedir: src/babeltrace
           skip-tag: true
-          git-tool: jgit
 
     triggers:
       - pollscm:
@@ -166,6 +165,9 @@
               total-high: 0
               total-normal: 0
               total-low: 0
+      - archive:
+          artifacts: 'tap/**'
+          allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
           always: false
@@ -206,7 +208,7 @@
               total-normal: 0
               total-low: 0
       - archive:
-          artifacts: 'build/**'
+          artifacts: 'build/**,tap/**'
           allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
@@ -248,7 +250,7 @@
               total-normal: 0
               total-low: 0
       - archive:
-          artifacts: 'build/**'
+          artifacts: 'build/**,tap/**'
           allow-empty: false
 
 
@@ -274,6 +276,18 @@
     name: babeltrace_{version}_winbuild
     defaults: babeltrace
 
+    # Use jgit on windows to work around path too long error
+    scm:
+      - git:
+          url: git://github.com/{github_user}/{github_name}.git
+          browser: githubweb
+          browser-url: https://github.com/{github_user}/{github_name}
+          branches:
+            - origin/{version}
+          basedir: src/babeltrace
+          skip-tag: true
+          git-tool: jgit
+
     <<: *babeltrace_build_axes_defaults
     <<: *babeltrace_build_builders_win
     <<: *babeltrace_build_publishers_prod
@@ -318,7 +332,7 @@
     node: 'master' # Applies only to matrix flyweight task
     execution-strategy:
       combination-filter: |
-        (build=="std" && conf=="python-bindings") || (arch=="amd64")
+        (build=="std" && conf=="std") || (arch=="amd64")
     axes:
       - axis:
          type: slave
@@ -504,6 +518,9 @@
           cron: "@daily"
     <<: *babeltrace_version_glib-2-22-5_anchor
     publishers:
+      - archive:
+          artifacts: 'tap/**'
+          allow-empty: false
       - email-ext:
           recipients: '{obj:email_to}'
           reply-to: ci-notification@lists.lttng.org
@@ -557,35 +574,23 @@
 
 ## Project
 - project:
-    name: babeltrace
+    name: babeltrace1
     github_user: efficios
     github_name: babeltrace
     email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
     version:
       - stable-1.5
-      - stable-2.0
-      - master
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, static, python-bindings, production]
-          version:
-            - stable-2.0
-            - master
-      - 'babeltrace_{version}_{buildtype}':
-          buildtype: build
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist]
+          build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, static, python-bindings]
-          version:
-            - stable-1.5
       - 'babeltrace_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, static, python-bindings]
+          conf: !!python/tuple [std, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
           arch: !!python/tuple [sles12sp2]
@@ -594,8 +599,6 @@
           version: # // support 1.3 on SLES12
             - stable-1.3
             - stable-1.5
-            - stable-2.0
-            - master
       - 'babeltrace_{version}_{buildtype}':
           buildtype: solarisbuild
           arch: !!python/tuple [sol10-i386, sol11-i386]
@@ -605,11 +608,7 @@
           buildtype: macosxbuild
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
-          version: # macOS support was introduced in 1.4
-            - stable-1.5
-            - stable-2.0
-            - master
+          conf: !!python/tuple [std, python-bindings]
       - 'babeltrace_{version}_{cctype}':
           cctype: clangbuild
           arch: !!python/tuple [amd64]
@@ -617,18 +616,52 @@
           conf: !!python/tuple [std, static]
           cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7]
       - 'babeltrace_{version}_winbuild':
-          arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64]
+          arch: !!python/tuple [cygwin, cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          version: # Mingw support was introduced in 2.0
-            - stable-2.0
-            - master
+      - 'babeltrace_{version}_cppcheck'
+      - 'babeltrace_{version}_scan-build'
+      - 'babeltrace_{version}_pylint'
+
+- project:
+    name: babeltrace2
+    github_user: efficios
+    github_name: babeltrace
+    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
+    version:
+      - stable-2.0
+      - master
+    jobs:
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: build
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, oot, dist, oot-dist]
+          conf: !!python/tuple [std, static, prod, min]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: portbuild
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: slesbuild
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: macosxbuild
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, prod]
+      - 'babeltrace_{version}_{cctype}':
+          cctype: clangbuild
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, static, prod]
+          cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7]
       - 'babeltrace_{version}_winbuild':
-          arch: !!python/tuple [cygwin, cygwin64]
+          arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          version: # Cygwin support was introduced in 1.5
-            - stable-1.5
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
       - 'babeltrace_{version}_pylint'
@@ -637,7 +670,6 @@
       - 'babeltrace_{version}_glib-2.22.5':
           version: master
 
-
 - project:
     name: babeltrace-jgalar-staging
     user: jgalar
@@ -656,7 +688,7 @@
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist]
+          build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, static, python-bindings]
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
           buildtype: macosxbuild
@@ -677,5 +709,5 @@
       - 'dev_gerrit_babeltrace_{buildtype}':
           buildtype: build
           arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386]
-          build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, static, python-bindings, production]
+          build: !!python/tuple [std, oot, dist, oot-dist]
+          conf: !!python/tuple [std, static, prod, min]