From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 24 May 2016 19:57:24 +0000 (-0400)
Subject: Remove all 2.6 related jobs
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=9beacf9195455652062c2faec8a2b0b0d16f0c3f;p=lttng-ci.git

Remove all 2.6 related jobs

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

diff --git a/jobs/inc/lttng-modules-versions.yaml.inc b/jobs/inc/lttng-modules-versions.yaml.inc
deleted file mode 100644
index be356b5..0000000
--- a/jobs/inc/lttng-modules-versions.yaml.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-- stable-2.6
-- stable-2.7
-- stable-2.8
-- master
diff --git a/jobs/inc/lttng-tools-versions.yaml.inc b/jobs/inc/lttng-tools-versions.yaml.inc
deleted file mode 100644
index be356b5..0000000
--- a/jobs/inc/lttng-tools-versions.yaml.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-- stable-2.6
-- stable-2.7
-- stable-2.8
-- master
diff --git a/jobs/inc/lttng-ust-versions.yaml.inc b/jobs/inc/lttng-ust-versions.yaml.inc
deleted file mode 100644
index be356b5..0000000
--- a/jobs/inc/lttng-ust-versions.yaml.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-- stable-2.6
-- stable-2.7
-- stable-2.8
-- master
diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 8ecbaf1..b25fa1f 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -348,7 +348,9 @@
     github_user: lttng
     github_name: lttng-modules
     mversion:
-      !include: jobs/inc/lttng-modules-versions.yaml.inc
+      - stable-2.7
+      - stable-2.8
+      - master
     jobs:
       - 'lttng-modules_{mversion}_build-vanilla'
       - 'lttng-modules_{mversion}_build-rt':
diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 8bcd90c..bf42663 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -340,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
@@ -390,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
@@ -416,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
diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 59a749c..f30982a 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -373,7 +373,9 @@
     github_user: lttng
     github_name: lttng-ust
     version:
-      !include: jobs/inc/lttng-ust-versions.yaml.inc
+      - stable-2.7
+      - stable-2.8
+      - master
     jobs:
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build