X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=75387d4b9b8edc3aef19b470f1872524ed9fcebf;hb=556e87cc3414e50377bbdfb542755f1bc231450f;hp=491ce5d33327da2eb465b60d2e42a04f37675558;hpb=9565443101589c6455b3aca9282830668ff175f6;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 491ce5d..75387d4 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -76,6 +76,8 @@
           option: 'category'
           categories:
             - 'lttng-tools'
+          matrixbuilds: false
+          matrixconfigs: true
 
     builders:
       - conditional-step:
@@ -160,7 +162,7 @@
                 target: 'deps/lttng-ust'
                 do-not-fingerprint: true
       - shell:
-         !include-raw-escape scripts/lttng-tools/build.sh
+         !include-raw-escape: scripts/lttng-tools/build.sh
 
     # TODO: Scan for open tasks
     publishers:
@@ -237,7 +239,7 @@
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/lttng-tools/scan-build.sh
+          !include-raw-escape: scripts/lttng-tools/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -281,7 +283,7 @@
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -307,7 +309,7 @@
            target: 'deps/lttng-tools'
            do-not-fingerprint: true
        - shell:
-          !include-raw-escape scripts/lttng-tools/pylint.sh
+          !include-raw-escape: scripts/lttng-tools/pylint.sh
 
     publishers:
       - archive:
@@ -333,7 +335,7 @@
 - project:
     name: lttng-tools
     version:
-      !include jobs/inc/lttng-tools-versions.yaml.inc
+      !include: jobs/inc/lttng-tools-versions.yaml.inc
     jobs:
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
@@ -346,7 +348,7 @@
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: master
-          arch: !!python/tuple [armhf, powerpc, ppc64el]
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
           urcuversion: !!python/tuple [master]
@@ -357,42 +359,42 @@
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
-          urcuversion: !!python/tuple [stable-0.8]
-          babelversion: !!python/tuple [stable-1.2]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.7
-          arch: !!python/tuple [armhf, powerpc]
+          arch: !!python/tuple [armhf, arm64, powerpc]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
-          urcuversion: !!python/tuple [stable-0.8]
-          babelversion: !!python/tuple [stable-1.2]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.6
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, no-ust, python-bindings]
-          urcuversion: !!python/tuple [stable-0.8]
-          babelversion: !!python/tuple [stable-1.2]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.6
-          arch: !!python/tuple [armhf, powerpc]
+          arch: !!python/tuple [armhf, arm64, powerpc]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, no-ust, python-bindings]
-          urcuversion: !!python/tuple [stable-0.8]
-          babelversion: !!python/tuple [stable-1.2]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master
           urcuversion: master
       - 'lttng-tools_{version}_scan-build':
           version: stable-2.7
-          urcuversion: stable-0.8
+          urcuversion: stable-0.9
       - 'lttng-tools_{version}_scan-build':
          version: stable-2.6
-         urcuversion: stable-0.8
+         urcuversion: stable-0.9
       #- 'lttng-tools_{version}_pylint'
       - 'lttng-tools_{version}_coverity':
           version: master