jjb: Add slesbuild jobs

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

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 616753cfd7bb0d9621268debb970420c78796beb..4721dac83554e567e2829498fe0a6ac6efff2af0 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -357,6 +357,11 @@
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static, python-bindings]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: slesbuild
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: solarisbuild
           arch: !!python/tuple [solaris10, solaris11]

diff --git a/jobs/inc/liburcu-versions.yaml.inc b/jobs/inc/liburcu-versions.yaml.inc
deleted file mode 100644 (file)
index b356fdb..0000000
--- a/jobs/inc/liburcu-versions.yaml.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-- stable-0.8
-- stable-0.9
-- master

diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml
index 190e4637f522ce31d2b31e4c9a046433a6c70ee6..2915d2b14100a0d71ad60ba36bc6140f39d2c135 100644 (file)
--- a/jobs/liburcu.yaml
+++ b/jobs/liburcu.yaml
@@ -279,6 +279,11 @@
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static, tls_fallback, debug-rcu]
+      - 'liburcu_{version}_{buildtype}':
+          buildtype: slesbuild
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
       - 'liburcu_{version}_{buildtype}':
           buildtype: solarisbuild
           arch: !!python/tuple [solaris10, solaris11]

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 6fb8bc90a03ecdee62bffc6b9cefa8df4c4f2d6a..b8e1213a4a5229d32d78b9eac1002a7e5e4f4363 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -494,6 +494,7 @@
       - stable-2.10
       - master
     jobs:
+      # Master #
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: master
@@ -513,41 +514,42 @@
           urcuversion: !!python/tuple [master]
           babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
+          buildtype: slesbuild
           version: master
           ustversion: master
-          arch: !!python/tuple [macosx]
+          arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
+          conf: !!python/tuple [std]
           urcuversion: !!python/tuple [master]
           babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: macosxbuild
-          version: stable-2.10
-          ustversion: stable-2.10
+          version: master
+          ustversion: master
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.9]
+          urcuversion: !!python/tuple [master]
           babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
-          buildtype: macosxbuild
-          version: stable-2.9
-          ustversion: stable-2.9
-          arch: !!python/tuple [macosx]
+          buildtype: solarisbuild
+          version: master
+          ustversion: master
+          arch: !!python/tuple [solaris10, solaris11]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.9]
+          urcuversion: !!python/tuple [master]
           babelversion: !!python/tuple [stable-1.5]
-      - 'lttng-tools_{version}_{buildtype}':
-          buildtype: solarisbuild
+      - 'lttng-tools_{version}_winbuild':
           version: master
           ustversion: master
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [cygwin, cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
           babelversion: !!python/tuple [stable-1.5]
+
+      # stable-2.10
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.10
@@ -566,6 +568,15 @@
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.5]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: stable-2.10
+          ustversion: stable-2.10
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: solarisbuild
           version: stable-2.10
@@ -575,6 +586,25 @@
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.5]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: macosxbuild
+          version: stable-2.10
+          ustversion: stable-2.10
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.5]
+      - 'lttng-tools_{version}_winbuild':
+          version: stable-2.10
+          ustversion: stable-2.10
+          arch: !!python/tuple [cygwin, cygwin64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.5]
+
+      # stable-2.9 #
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.9
@@ -593,6 +623,15 @@
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.5]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: stable-2.9
+          ustversion: stable-2.9
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: solarisbuild
           version: stable-2.9
@@ -602,6 +641,25 @@
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.5]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: macosxbuild
+          version: stable-2.9
+          ustversion: stable-2.9
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.5]
+      - 'lttng-tools_{version}_winbuild':
+          version: stable-2.9
+          ustversion: stable-2.9
+          arch: !!python/tuple [cygwin, cygwin64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.5]
+
+      # stable-2.8 #
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.8
@@ -620,6 +678,15 @@
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.4]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: stable-2.8
+          ustversion: stable-2.8
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: solarisbuild
           version: stable-2.8
@@ -629,6 +696,8 @@
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.4]
+
+      # stable-2.7 #
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.7
@@ -647,30 +716,16 @@
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.3]
-      - 'lttng-tools_{version}_winbuild':
-          version: master
-          ustversion: master
-          arch: !!python/tuple [cygwin, cygwin64]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [stable-1.5]
-      - 'lttng-tools_{version}_winbuild':
-          version: stable-2.10
-          ustversion: stable-2.10
-          arch: !!python/tuple [cygwin, cygwin64]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
-          urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.5]
-      - 'lttng-tools_{version}_winbuild':
-          version: stable-2.9
-          ustversion: stable-2.9
-          arch: !!python/tuple [cygwin, cygwin64]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: stable-2.7
+          ustversion: stable-2.7
+          arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [relayd-only]
+          conf: !!python/tuple [std]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.5]
+          babelversion: !!python/tuple [stable-1.3]
+
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 800bb95e56a6ba3cb5bc614fa9ec2178db2d869d..9d61177fc7525cb65445a63ab4f8caa35eb2675e 100644 (file)
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -61,8 +61,7 @@
       - axis:
          type: user-defined
          name: liburcu_version
-         values:
-           !include: jobs/inc/liburcu-versions.yaml.inc
+         values: '{obj:liburcu_version}'
       - axis:
          type: user-defined
          name: build
@@ -272,11 +271,19 @@
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, dist, oot, oot-dist]
           conf: !!python/tuple [std, agents, debug-rcu]
+          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master]
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master]
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master]
       - 'lttng-ust_{version}_cppcheck'
       - 'lttng-ust_{version}_scan-build'
       - 'lttng-ust_{version}_coverity':