Use upstream jjb instead of custom from mjeanson

[lttng-ci.git] / jobs / lttng-tools.yaml

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 6fb8bc90a03ecdee62bffc6b9cefa8df4c4f2d6a..a70ec9405b40bbb509e2329499ff3c13ba33825f 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -251,26 +251,26 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{arch}}'
-          condition-string2: 'msys32'
+          condition-string2: 'msys2-mingw32'
           steps:
             - inject:
                properties-content: 'MSYSTEM=MINGW32'
             - shell:
                !include-raw-escape:
-                 - scripts/common/msys32-shebang
+                 - scripts/common/msys2-shebang
                  - scripts/common/cygwin-prefix
                  - scripts/lttng-tools/build.sh
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{arch}}'
-          condition-string2: 'msys64'
+          condition-string2: 'msys2-mingw64'
           steps:
             - inject:
                properties-content: 'MSYSTEM=MINGW64'
             - shell:
                !include-raw-escape:
-                 - scripts/common/msys64-shebang
+                 - scripts/common/msys2-shebang
                  - scripts/common/cygwin-prefix
                  - scripts/lttng-tools/build.sh
 
@@ -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 [sol10-i386, sol11-i386]
           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,15 +568,43 @@
           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
           ustversion: stable-2.10
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
+          build: !!python/tuple [std]
+          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,15 +623,43 @@
           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
           ustversion: stable-2.9
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           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,15 +678,26 @@
           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
           ustversion: stable-2.8
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           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
@@ -637,7 +706,7 @@
           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.3]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.7
@@ -646,31 +715,17 @@
           build: !!python/tuple [std]
           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]
+
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master
@@ -749,7 +804,7 @@
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: master-staging
@@ -794,7 +849,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.3]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           buildtype: macosxbuild
           version: master-staging
@@ -808,7 +863,7 @@
           buildtype: solarisbuild
           version: master-staging
           ustversion: master
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]