From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 6 May 2016 18:28:58 +0000 (-0400)
Subject: babeltrace: Add stable-1.4 branch
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ecf9997ab7e7408ce0db7fdf5c6532f9eabd54ed;p=lttng-ci.git

babeltrace: Add stable-1.4 branch

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

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 637a997..2fc0a90 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -264,7 +264,10 @@
     github_user: efficios
     github_name: babeltrace
     version:
-      !include: jobs/inc/babeltrace-versions.yaml.inc
+      - stable-1.2
+      - stable-1.3
+      - stable-1.4
+      - master
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
@@ -288,6 +291,7 @@
           conf: !!python/tuple [std, static]
           version:
             - stable-1.3
+            - stable-1.4
             - master
       - 'babeltrace_{version}_{buildtype}':
           buildtype: macosxbuild
@@ -295,6 +299,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static]
           version:
+            - stable-1.4
             - master
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
@@ -318,6 +323,7 @@
             - master-staging
             - stable-1.2-staging
             - stable-1.3-staging
+            - stable-1.4-staging
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]
diff --git a/jobs/inc/babeltrace-versions.yaml.inc b/jobs/inc/babeltrace-versions.yaml.inc
deleted file mode 100644
index 9306544..0000000
--- a/jobs/inc/babeltrace-versions.yaml.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-- stable-1.2
-- stable-1.3
-- master
diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 75d4be0..8bcd90c 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -365,7 +365,7 @@
           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
@@ -373,7 +373,7 @@
           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