jjb: lttng-ust master requires liburcu master

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

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index b8e1213a4a5229d32d78b9eac1002a7e5e4f4363..cd51a2cd1d585869b27a1567cf6170bed94886d1 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
 
@@ -535,7 +535,7 @@
           buildtype: solarisbuild
           version: master
           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]
@@ -581,7 +581,7 @@
           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]
@@ -636,7 +636,7 @@
           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]
@@ -691,7 +691,7 @@
           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]
@@ -863,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]