jjb: lttng-tools: fixes for dev_upstream_

Remove 'stable-2.10' and 'stable-2.11' from the main job. Remove the
'std' axis from tools to align with the ust job.

Change-Id: I6dc190eba56c02e2fba85e8a584f09c249d5aa4e
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 91d65a3e5982d422bc4a2b757ef5566e2ef21afa..952054d89d2ab5f3fdcb3813665d1f5baa5fdbc0 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -1066,8 +1066,6 @@
     github_user: lttng
     email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
     version:
-      - stable-2.10
-      - stable-2.11
       - stable-2.12
       - stable-2.13
       - master
@@ -1400,7 +1398,7 @@
           ustversion: stable-2.11
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, agents]
+          conf: !!python/tuple [no-ust, agents]
           urcuversion: !!python/tuple [stable-0.11]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
@@ -1468,7 +1466,7 @@
           ustversion: stable-2.10
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, agents]
+          conf: !!python/tuple [no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]