X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=22bdc3a3cb2165fb07dfb6f0144d89f3324ff4a6;hb=d02fd60421fcb4a65ac1fedeb5dc8bce54b2ce4b;hp=5de63d8148524954d440a6252526af86dc31b777;hpb=10bbe356323e68a2e206b8ccb8de984933fd1282;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 5de63d8..22bdc3a 100644
--- 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:
@@ -274,6 +273,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 +329,7 @@
     node: 'master' # Applies only to matrix flyweight task
     execution-strategy:
       combination-filter: |
-        ((build=="std" && conf=="python-bindings" && bt2_mode=="std") || (arch=="amd64")) && (! (arch="amd64" && (build=="oot" || build=="dist") && bt2_mode=="dev"))
+        (build=="std" && conf=="python-bindings") || (arch=="amd64")
     axes:
       - axis:
          type: slave
@@ -332,10 +343,6 @@
          type: user-defined
          name: build
          values: '{obj:build}'
-      - axis:
-         type: user-defined
-         name: bt2_mode
-         values: '{obj:bt2_mode}'
 
     <<: *babeltrace_build_builders_defaults
     <<: *babeltrace_build_publishers_gerrit
@@ -570,11 +577,21 @@
       - 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]
           conf: !!python/tuple [std, static, python-bindings]
+          version:
+            - stable-1.5
       - 'babeltrace_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
@@ -672,5 +689,4 @@
           buildtype: build
           arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, python-bindings]
-          bt2_mode: !!python/tuple [dev, std]
+          conf: !!python/tuple [std, static, python-bindings, production]