jjb: babeltrace: drop mingw32 flavor from winbuild

The MSYS2 project is starting to deprecate their 32-bit support, drop it
from the build matrix.

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

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 51dd99e5762e10984508a472d8605076ec8a417e..b5fd2fb3fd791341747cf512d81517f040292d8d 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -105,20 +105,6 @@
                  - scripts/common/cygpath-prefix
                  - scripts/common/print.sh
                  - scripts/babeltrace/build.sh
-      - conditional-step:
-          condition-kind: strings-match
-          on-evaluation-failure: run
-          condition-string1: {{ '${{platform}}' }}
-          condition-string2: 'msys2-mingw32'
-          steps:
-            - inject:
-               properties-content: 'MSYSTEM=MINGW32'
-            - shell:
-               !include-raw-escape:
-                 - scripts/common/msys2-shebang
-                 - scripts/common/cygpath-prefix
-                 - scripts/common/print.sh
-                 - scripts/babeltrace/build.sh
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
@@ -637,7 +623,7 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-mingw64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 6730106a7c42a0db3f365d54faf6e7e0a898a3fd..fcc9a18a83f280bbc4e13829d0c0a7dceaaccfea 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -332,21 +332,6 @@
                  - scripts/common/print.sh
                  - scripts/lttng-tools/build.sh
 
-      - conditional-step:
-          condition-kind: strings-match
-          on-evaluation-failure: run
-          condition-string1: '${{platform}}'
-          condition-string2: 'msys2-mingw32'
-          steps:
-            - inject:
-               properties-content: 'MSYSTEM=MINGW32'
-            - shell:
-               !include-raw-escape:
-                 - scripts/common/msys2-shebang
-                 - scripts/common/cygpath-prefix
-                 - scripts/common/print.sh
-                 - scripts/lttng-tools/build.sh
-
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run