jjb: fix lttng-tools build script to run unit tests for 2.8

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

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 999aceab794c0132873d5e4c582186548d223d8e..cc15677d0692e3d89aca4e6a5c5ec68ce4a0c4d9 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -45,9 +45,6 @@
 
     project-type: matrix
     node: 'master' # Applies only to matrix flyweight task
-    execution-strategy:
-      combination-filter: |
-        (build=="std") || (liburcu_version=="master")
     axes:
       - axis:
          type: slave
@@ -343,7 +340,9 @@
     github_user: lttng
     github_name: lttng-tools
     version:
-      !include: jobs/inc/lttng-tools-versions.yaml.inc
+      - stable-2.7
+      - stable-2.8
+      - master
     jobs:
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
@@ -368,15 +367,15 @@
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.4]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.8
-          arch: !!python/tuple [armhf, arm64, powerpc]
+          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 [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.4]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.7
@@ -393,22 +392,6 @@
           conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
           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.9]
-          babelversion: !!python/tuple [stable-1.3]
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.6
-          arch: !!python/tuple [armhf, arm64, powerpc]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master
@@ -419,9 +402,6 @@
       - 'lttng-tools_{version}_scan-build':
           version: stable-2.7
           urcuversion: stable-0.9
-      - 'lttng-tools_{version}_scan-build':
-         version: stable-2.6
-         urcuversion: stable-0.9
       #- 'lttng-tools_{version}_pylint'
       - 'lttng-tools_{version}_coverity':
           version: master