Merge topic 'ci-arch-tags' into release

ed597a37 gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Mathieu Westphal <mathieu.westphal@kitware.com>
Merge-request: !1050

.gitlab/os-linux.yml

@@ -66,13 +66,13 @@
     tags:
         - build
         - docker
-        - linux
+        - linux-x86_64
         - paraview
 
 .linux_test_tags:
     tags:
         - docker
-        - linux
+        - linux-x86_64
         - paraview
         - x11
 

.gitlab/os-macos.yml

@@ -41,7 +41,7 @@
 .macos_builder_tags:
     tags:
         - paraview
-        - macos
+        - macos-x86_64
         - shell
         - xcode-13.1
         - nonconcurrent
@@ -59,7 +59,7 @@
 .macos_builder_tags_test:
     tags:
         - paraview
-        - macos
+        - macos-x86_64
         - shell
         - xcode-13.1
         - nonconcurrent

.gitlab/os-windows.yml

@@ -52,7 +52,7 @@
         - nonconcurrent
         - shell
         - vs2019
-        - windows
+        - windows-x86_64
 
 .windows_test_tags:
     tags:
@@ -61,7 +61,7 @@
         - nonconcurrent
         - shell
         - vs2019
-        - windows
+        - windows-x86_64
         - test # Some machines have trouble running tests.
 
 ## Windows-specific scripts

.gitlab/upload.yml

@@ -5,7 +5,7 @@
     stage: upload
     tags:
         - docker
-        - linux
+        - linux-x86_64
         - build
     environment:
         name: rsync-upload