CI: move from only to rules

This commit is contained in:
Vicente Adolfo Bolea Sanchez 2021-10-18 14:36:16 -04:00
parent 39934257cb
commit a5aeda7240
8 changed files with 48 additions and 51 deletions

@ -110,13 +110,7 @@
extends:
- .docker_image
.only-default: &only-default
only:
- master@vtk/vtk-m
- tags@vtk/vtk-m
- merge_requests
.only-automatically: &only-automatically
.run_automatically: &run_automatically
rules:
- if: '$CI_MERGE_REQUEST_ID'
when: on_success
@ -124,20 +118,23 @@
when: on_success
- when: never
.only-scheduled: &only-scheduled
.run_scheduled: &run_scheduled
rules:
- if: '$CI_MERGE_REQUEST_ID'
when: manual
- if: '$CI_COMMIT_TAG && $CI_PROJECT_PATH == "vtk/vtk-m"'
- if: '$CI_PROJECT_PATH == "vtk/vtk-m" && $CI_COMMIT_TAG'
when: on_success
- if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_PATH == "vtk/vtk-m"'
- if: '$CI_PROJECT_PATH == "vtk/vtk-m" && $CI_PIPELINE_SOURCE == "schedule"'
when: on_success
- if: '$CI_PROJECT_PATH == "vtk/vtk-m"'
when: manual
- when: never
.only-master: &only-master
only:
- master@vtk/vtk-m
.run_master: &run_master
rules:
- if: '$CI_PROJECT_PATH == "vtk/vtk-m" && $CI_COMMIT_BRANCH == "master"'
when: on_success
- when: never
# General Longer Term Tasks:
# - Setup clang tidy as sub-pipeline

@ -12,7 +12,7 @@ build:centos7_gcc73:
extends:
- .centos7
- .cmake_build_linux
- .only-default
- .run_automatically
- .use_minimum_supported_cmake
variables:
CMAKE_BUILD_TYPE: RelWithDebInfo
@ -30,7 +30,7 @@ test:centos7_gcc73:
extends:
- .centos7
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:centos7_gcc73
needs:
@ -47,7 +47,7 @@ test:rhel8_test_centos7:
extends:
- .rhel8
- .cmake_test_linux
- .only-default
- .run_automatically
variables:
CTEST_EXCLUSIONS: "built_against_test_install"
dependencies:

@ -10,7 +10,7 @@ build:centos8_sanitizer:
extends:
- .centos8
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CMAKE_BUILD_TYPE: RelWithDebInfo
CMAKE_GENERATOR: "Unix Makefiles"
@ -26,7 +26,7 @@ test:centos8_sanitizer:
extends:
- .centos8
- .cmake_memcheck_linux
- .only-default
- .run_automatically
variables:
OMP_NUM_THREADS: 4
CTEST_MEMORYCHECK_TYPE: LeakSanitizer

@ -10,7 +10,7 @@ build:rhel8:
extends:
- .rhel8
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CMAKE_GENERATOR: "Unix Makefiles"
VTKM_SETTINGS: "serial+shared+64bit_floats+32bit_ids"
@ -24,7 +24,7 @@ test:rhel8:
extends:
- .rhel8
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:rhel8
needs:
@ -41,7 +41,7 @@ build:rhel8_vtk_types:
extends:
- .rhel8
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CMAKE_GENERATOR: "Unix Makefiles"
VTKM_SETTINGS: "serial+vtk_types"
@ -55,7 +55,7 @@ test:rhel8_vtk_types:
extends:
- .rhel8
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:rhel8_vtk_types
needs:

@ -12,7 +12,7 @@ build:ubuntu1604_gcc5:
extends:
- .ubuntu1604_cuda
- .cmake_build_linux
- .only-default
- .run_automatically
- .use_minimum_supported_cmake
variables:
CC: "gcc-5"
@ -31,7 +31,7 @@ test:ubuntu1604_gcc5:
extends:
- .ubuntu1604_cuda
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:ubuntu1604_gcc5
needs:
@ -50,7 +50,7 @@ build:ubuntu1604_gcc5_2:
extends:
- .ubuntu1604_cuda
- .cmake_build_linux
- .only-master
- .run_master
- .use_minimum_supported_cmake
variables:
CC: "gcc-5"
@ -69,7 +69,7 @@ test:ubuntu1804_test_ubuntu1604_gcc5_2:
extends:
- .ubuntu1804_cuda
- .cmake_test_linux
- .only-master
- .run_master
variables:
CTEST_EXCLUSIONS: "built_against_test_install"
dependencies:
@ -88,7 +88,7 @@ build:ubuntu1604_clang5:
extends:
- .ubuntu1604
- .cmake_build_linux
- .only-default
- .run_automatically
- .use_minimum_supported_cmake
variables:
CC: "clang-5.0"
@ -105,7 +105,7 @@ test:ubuntu1604_clang5:
extends:
- .ubuntu1604
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:ubuntu1604_clang5
needs:

@ -11,7 +11,7 @@ build:ubuntu1804_gcc9:
extends:
- .ubuntu1804
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CC: "gcc-9"
CXX: "g++-9"
@ -27,7 +27,7 @@ test:ubuntu1804_gcc9:
extends:
- .ubuntu1804
- .cmake_test_linux
- .only-default
- .run_automatically
variables:
#Restrict OpenMP number of threads since multiple test stages
#execute on the same hardware concurrently
@ -51,7 +51,7 @@ build:ubuntu1804_gcc7:
extends:
- .ubuntu1804_cuda
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CC: "gcc-7"
CXX: "g++-7"
@ -69,7 +69,7 @@ test:ubuntu1804_gcc7:
extends:
- .ubuntu1804_cuda
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:ubuntu1804_gcc7
needs:
@ -90,8 +90,8 @@ build:ubuntu1804_clang_cuda:
extends:
- .ubuntu1804_cuda
- .cmake_build_linux
- .only-default
# - .only-master
- .run_automatically
# - .run_master
variables:
CC: "clang-8"
CXX: "clang++-8"
@ -109,8 +109,8 @@ test:ubuntu1804_clang_cuda:
extends:
- .ubuntu1804_cuda
- .cmake_test_linux
- .only-default
# - .only-master
- .run_automatically
# - .run_master
dependencies:
- build:ubuntu1804_clang_cuda
needs:
@ -127,7 +127,7 @@ build:ubuntu1804_gcc6:
extends:
- .ubuntu1804
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CC: "gcc-6"
CXX: "g++-6"
@ -142,7 +142,7 @@ test:ubuntu1804_gcc6:
extends:
- .ubuntu1804
- .cmake_test_linux
- .only-default
- .run_automatically
variables:
#Restrict OpenMP number of threads since multiple test stages
#execute on the same hardware concurrently
@ -163,7 +163,7 @@ build:ubuntu1804_clang8:
extends:
- .ubuntu1804
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CC: "clang-8"
CXX: "clang++-8"
@ -179,7 +179,7 @@ test:ubuntu1804_clang8:
extends:
- .ubuntu1804
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:ubuntu1804_clang8
needs:
@ -198,7 +198,7 @@ build:ubuntu1804_kokkos:
extends:
- .ubuntu1804_cuda_kokkos
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CMAKE_GENERATOR: "Ninja"
CMAKE_BUILD_TYPE: Release
@ -215,7 +215,7 @@ test:ubuntu1804_kokkos:
extends:
- .ubuntu1804_cuda_kokkos
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:ubuntu1804_kokkos
needs:

@ -7,7 +7,7 @@ build:ubuntu2004_gcc9:
extends:
- .ubuntu2004
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CMAKE_BUILD_TYPE: Debug
VTKM_SETTINGS: "benchmarks+tbb+openmp+mpi+shared+hdf5"
@ -21,7 +21,7 @@ test:ubuntu2004_gcc9:
extends:
- .ubuntu2004
- .cmake_test_linux
- .only-default
- .run_automatically
variables:
#Restrict OpenMP number of threads since multiple test stages
#execute on the same hardware concurrently
@ -40,7 +40,7 @@ build:ubuntu2004_kokkos:
extends:
- .ubuntu2004_kokkos
- .cmake_build_linux
- .only-default
- .run_automatically
variables:
CMAKE_BUILD_TYPE: RelWithDebInfo
VTKM_SETTINGS: "kokkos+shared+64bit_floats"
@ -54,7 +54,7 @@ test:ubuntu2004_kokkos:
extends:
- .ubuntu2004_kokkos
- .cmake_test_linux
- .only-default
- .run_automatically
dependencies:
- build:ubuntu2004_kokkos
needs:
@ -69,7 +69,7 @@ build:ubuntu2004_hip_kokkos:
extends:
- .ubuntu2004_hip_kokkos
- .cmake_build_linux
- .only-scheduled
- .run_scheduled
variables:
CMAKE_BUILD_TYPE: RelWithDebInfo
VTKM_SETTINGS: "benchmarks+kokkos+hip+no_virtual+no_rendering"
@ -86,7 +86,7 @@ test:ubuntu2004_hip_kokkos:
extends:
- .ubuntu2004_hip_kokkos
- .cmake_test_linux
- .only-automatically
- .run_automatically
variables:
CTEST_TIMEOUT: "30"
dependencies:

@ -93,7 +93,7 @@ build:windows_vs2019:
- large-memory
extends:
- .cmake_build_windows
- .only-default
- .run_automatically
variables:
CMAKE_GENERATOR: "Ninja"
CMAKE_BUILD_TYPE: Release
@ -114,7 +114,7 @@ test:windows_vs2019:
- turing
extends:
- .cmake_test_windows
- .only-default
- .run_automatically
dependencies:
- build:windows_vs2019
needs: