From 23ea1b886ffd28b19e44a8ca7729108201b68d18 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 16 Apr 2019 10:52:30 -0400
Subject: [PATCH] jjb: Remove deprecated stable-2.7 jobs, except sles12

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/lttng-modules.yaml | 21 ---------------------
 jobs/lttng-tools.yaml   | 20 --------------------
 jobs/lttng-ust.yaml     | 10 +++++++++-
 3 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index c18c01a..95a3ef0 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -520,13 +520,6 @@
           kverfloor: v2.6.36
           kverceil: ''
           kverfilter: stable-head
-      - 'lttng-modules_{mversion}_{buildtype}-vanilla':
-          mversion: stable-2.7
-          buildtype: build
-          parambuildtype: build
-          kverfloor: v2.6.36
-          kverceil: v4.8-rc0
-          kverfilter: stable-head
       - 'lttng-modules_{mversion}_fullbuild-vanilla':
           mversion:
             - master
@@ -545,13 +538,6 @@
           kverfloor: v2.6.36
           kverceil: ''
           kverfilter: none
-      - 'lttng-modules_{mversion}_fullbuild-vanilla':
-          mversion: stable-2.7
-          buildtype: build
-          parambuildtype: build
-          kverfloor: v2.6.36
-          kverceil: v4.8-rc0
-          kverfilter: none
 
 # RT normal builds
       - 'lttng-modules_{mversion}_build-rt':
@@ -587,13 +573,6 @@
           kverfloor: v3.18
           kverceil: ''
           kverfilter: stable-head
-      - 'lttng-modules_{mversion}_{buildtype}-vanilla':
-          mversion: stable-2.7
-          buildtype: crossbuild
-          parambuildtype: crossbuild
-          kverfloor: v3.18
-          kverceil: v4.8-rc0
-          kverfilter: stable-head
 
 # Ubuntu cross builds
       - 'lttng-modules_{mversion}_{buildtype}-{uversion}':
diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 3e4d895..3cae43f 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -986,26 +986,6 @@
           testtype: !!python/tuple [base]
 
       # stable-2.7 #
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.7
-          ustversion: stable-2.7
-          arch: !!python/tuple [amd64]
-          build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, agents, debug-rcu]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.7
-          ustversion: stable-2.7
-          arch: !!python/tuple [armhf, arm64, powerpc]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, agents]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.5]
-          testtype: !!python/tuple [base]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.7
diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index ec21a82..290452f 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -293,7 +293,6 @@
     github_name: lttng-ust
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
     version:
-      - stable-2.7
       - stable-2.8
       - stable-2.9
       - stable-2.10
@@ -347,3 +346,12 @@
       - 'lttng-ust_{version}_coverity':
           version: master
 
+      # stable-2.7
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: stable-2.7
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.9]
+
-- 
2.34.1