From 7766bbc3cd18b101e87525d43050f7da357485e1 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 21 Dec 2022 09:34:18 -0500 Subject: [PATCH] gitlab-ci: use arch-specific tags for OS selection Also add some missing OS tags for HIP jobs. --- .gitlab/ci/centos7.yml | 6 +++--- .gitlab/ci/centos8.yml | 4 ++-- .gitlab/ci/doxygen.yml | 2 +- .gitlab/ci/rhel8.yml | 8 ++++---- .gitlab/ci/ubuntu1604.yml | 12 ++++++------ .gitlab/ci/ubuntu1804.yml | 24 ++++++++++++------------ .gitlab/ci/ubuntu2004.yml | 10 ++++++---- .gitlab/ci/windows10.yml | 4 ++-- 8 files changed, 36 insertions(+), 34 deletions(-) diff --git a/.gitlab/ci/centos7.yml b/.gitlab/ci/centos7.yml index c30be42bd..018b83fc1 100644 --- a/.gitlab/ci/centos7.yml +++ b/.gitlab/ci/centos7.yml @@ -6,7 +6,7 @@ build:centos7_gcc73: - build - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - large-memory extends: @@ -24,7 +24,7 @@ test:centos7_gcc73: - test - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - turing extends: @@ -41,7 +41,7 @@ test:rhel8_test_centos7: - test - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - turing extends: diff --git a/.gitlab/ci/centos8.yml b/.gitlab/ci/centos8.yml index 03ca9a583..ab1592dc0 100644 --- a/.gitlab/ci/centos8.yml +++ b/.gitlab/ci/centos8.yml @@ -6,7 +6,7 @@ build:centos8_sanitizer: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .centos8 - .cmake_build_linux @@ -21,7 +21,7 @@ test:centos8_sanitizer: - test - vtkm - docker - - linux + - linux-x86_64 - privileged extends: - .centos8 diff --git a/.gitlab/ci/doxygen.yml b/.gitlab/ci/doxygen.yml index e04f4cb6b..da5bf167d 100644 --- a/.gitlab/ci/doxygen.yml +++ b/.gitlab/ci/doxygen.yml @@ -18,7 +18,7 @@ doxygen: tags: - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu2004_doxygen before_script: diff --git a/.gitlab/ci/rhel8.yml b/.gitlab/ci/rhel8.yml index c17398b9c..5908aa322 100644 --- a/.gitlab/ci/rhel8.yml +++ b/.gitlab/ci/rhel8.yml @@ -6,7 +6,7 @@ build:rhel8: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .rhel8 - .cmake_build_linux @@ -20,7 +20,7 @@ test:rhel8: - test - vtkm - docker - - linux + - linux-x86_64 extends: - .rhel8 - .cmake_test_linux @@ -37,7 +37,7 @@ build:rhel8_vtk_types: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .rhel8 - .cmake_build_linux @@ -51,7 +51,7 @@ test:rhel8_vtk_types: - test - vtkm - docker - - linux + - linux-x86_64 extends: - .rhel8 - .cmake_test_linux diff --git a/.gitlab/ci/ubuntu1604.yml b/.gitlab/ci/ubuntu1604.yml index fce61e4ac..e6eac8a1d 100644 --- a/.gitlab/ci/ubuntu1604.yml +++ b/.gitlab/ci/ubuntu1604.yml @@ -6,7 +6,7 @@ build:ubuntu1604_gcc5: - build - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - large-memory extends: @@ -25,7 +25,7 @@ test:ubuntu1604_gcc5: - test - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - pascal extends: @@ -44,7 +44,7 @@ build:ubuntu1604_gcc5_2: - build - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - large-memory extends: @@ -63,7 +63,7 @@ test:ubuntu1804_test_ubuntu1604_gcc5_2: - test - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - pascal extends: @@ -84,7 +84,7 @@ build:ubuntu1604_clang5: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu1604 - .cmake_build_linux @@ -101,7 +101,7 @@ test:ubuntu1604_clang5: - test - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu1604 - .cmake_test_linux diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml index 6b9121f1d..e7bde2c33 100644 --- a/.gitlab/ci/ubuntu1804.yml +++ b/.gitlab/ci/ubuntu1804.yml @@ -7,7 +7,7 @@ build:ubuntu1804_gcc9: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu1804 - .cmake_build_linux @@ -23,7 +23,7 @@ test:ubuntu1804_gcc9: - test - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu1804 - .cmake_test_linux @@ -45,7 +45,7 @@ build:ubuntu1804_gcc7: - build - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - large-memory extends: @@ -63,7 +63,7 @@ test:ubuntu1804_gcc7: - test - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - turing extends: @@ -84,7 +84,7 @@ build:ubuntu1804_clang_cuda: - build - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - large-memory extends: @@ -103,7 +103,7 @@ test:ubuntu1804_clang_cuda: - test - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - pascal extends: @@ -123,7 +123,7 @@ build:ubuntu1804_gcc6: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu1804 - .cmake_build_linux @@ -138,7 +138,7 @@ test:ubuntu1804_gcc6: - test - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu1804 - .cmake_test_linux @@ -159,7 +159,7 @@ build:ubuntu1804_clang8: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu1804 - .cmake_build_linux @@ -175,7 +175,7 @@ test:ubuntu1804_clang8: - test - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu1804 - .cmake_test_linux @@ -192,7 +192,7 @@ build:ubuntu1804_kokkos: - build - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - large-memory extends: @@ -209,7 +209,7 @@ test:ubuntu1804_kokkos: - test - vtkm - docker - - linux + - linux-x86_64 - cuda-rt - turing extends: diff --git a/.gitlab/ci/ubuntu2004.yml b/.gitlab/ci/ubuntu2004.yml index ad7aded76..2e0113fe3 100644 --- a/.gitlab/ci/ubuntu2004.yml +++ b/.gitlab/ci/ubuntu2004.yml @@ -3,7 +3,7 @@ build:ubuntu2004_gcc9: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu2004 - .cmake_build_linux @@ -17,7 +17,7 @@ test:ubuntu2004_gcc9: - test - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu2004 - .cmake_test_linux @@ -36,7 +36,7 @@ build:ubuntu2004_kokkos: - build - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu2004_kokkos - .cmake_build_linux @@ -50,7 +50,7 @@ test:ubuntu2004_kokkos: - test - vtkm - docker - - linux + - linux-x86_64 extends: - .ubuntu2004_kokkos - .cmake_test_linux @@ -65,6 +65,7 @@ build:ubuntu2004_hip_kokkos: - build - vtkm - docker + - linux-x86_64 - radeon extends: - .ubuntu2004_hip_kokkos @@ -82,6 +83,7 @@ test:ubuntu2004_hip_kokkos: - build - vtkm - docker + - linux-x86_64 - radeon extends: - .ubuntu2004_hip_kokkos diff --git a/.gitlab/ci/windows10.yml b/.gitlab/ci/windows10.yml index 9955d6a54..5da0da98d 100644 --- a/.gitlab/ci/windows10.yml +++ b/.gitlab/ci/windows10.yml @@ -86,7 +86,7 @@ build:windows_vs2019: - vtkm # Since this is a bare runner, pin to a project. - nonconcurrent - build - - windows + - windows-x86_64 - shell - vs2019 - msvc-19.25 @@ -106,7 +106,7 @@ test:windows_vs2019: - vtkm # Since this is a bare runner, pin to a project. - nonconcurrent - test - - windows + - windows-x86_64 - shell - vs2019 - msvc-19.25