jjb: drop macos-amd64 except for binutils-gdb

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

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 3fa5bfb4088e4c28d8723e1e57c23590672a94c0..6e40af06a09223dc2d3d608e14522168f96d0a1f 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -336,25 +336,10 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{platform}}'
-          condition-string2: 'msys2-mingw32'
+          condition-string2: 'msys2-ucrt64'
           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
-          condition-string1: '${{platform}}'
-          condition-string2: 'msys2-mingw64'
-          steps:
-            - inject:
-               properties-content: 'MSYSTEM=MINGW64'
+               properties-content: 'MSYSTEM=UCRT64'
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
@@ -684,9 +669,6 @@
             - '$GERRIT_REFSPEC'
           basedir: src/lttng-tools
           skip-tag: true
-          # Work-around for hangs while cloning lttng-tools from gerrit
-          # @see https://support.efficios.com/issues/1532
-          git-tool: jgit
 
     triggers:
       - gerrit: &lttng-tools_trigger_gerrit_default
@@ -1049,7 +1031,7 @@
 - view-template:
     name: 'LTTng-tools'
     view-type: list
-    regex: 'lttng-tools[-_].*'
+    regex: 'lttng-(docs|tools)[-_].*'
 
 
 ## Projects
@@ -1126,7 +1108,7 @@
           buildtype: macosbuild
           version: master
           ustversion: master
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]
@@ -1245,7 +1227,7 @@
           buildtype: macosbuild
           version: stable-2.13
           ustversion: stable-2.13
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1354,7 +1336,7 @@
           buildtype: macosbuild
           version: stable-2.12
           ustversion: stable-2.12
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1541,7 +1523,7 @@
           buildtype: macosbuild
           version: master-staging
           ustversion: master
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]