gitlab-ci won't trigger when just pushing remote branches

At the same time I have added the controls to allow for master only
builders which is required for nightly ubsan/asan testing
This commit is contained in:
Robert Maynard 2020-03-30 09:51:45 -04:00
parent 9eaaadb1bd
commit cbed21696d
6 changed files with 27 additions and 0 deletions

@ -68,6 +68,15 @@
extends: extends:
- .docker_image - .docker_image
.only-default: &only-default
only:
- master
- merge_requests
- tags
.only-master: &only-master
only:
- master
# General Longer Term Tasks: # General Longer Term Tasks:
# - setup asan, and ubsan as sub-pipeline # - setup asan, and ubsan as sub-pipeline

@ -11,6 +11,7 @@ build:centos7_gcc48:
extends: extends:
- .centos7 - .centos7
- .cmake_build_linux - .cmake_build_linux
- .only-default
variables: variables:
CMAKE_BUILD_TYPE: RelWithDebInfo CMAKE_BUILD_TYPE: RelWithDebInfo
CMAKE_GENERATOR: "Unix Makefiles" CMAKE_GENERATOR: "Unix Makefiles"
@ -27,6 +28,7 @@ test:centos7_gcc48:
extends: extends:
- .centos7 - .centos7
- .cmake_test_linux - .cmake_test_linux
- .only-default
dependencies: dependencies:
- build:centos7_gcc48 - build:centos7_gcc48
needs: needs:
@ -43,6 +45,7 @@ test:rhel8_test_centos7:
extends: extends:
- .rhel8 - .rhel8
- .cmake_test_linux - .cmake_test_linux
- .only-default
dependencies: dependencies:
- build:centos7_gcc48 - build:centos7_gcc48
needs: needs:

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

@ -11,6 +11,7 @@ build:ubuntu1604_gcc5:
extends: extends:
- .ubuntu1604_cuda - .ubuntu1604_cuda
- .cmake_build_linux - .cmake_build_linux
- .only-default
variables: variables:
CMAKE_BUILD_TYPE: RelWithDebInfo CMAKE_BUILD_TYPE: RelWithDebInfo
VTKM_SETTINGS: "cuda+pascal" VTKM_SETTINGS: "cuda+pascal"
@ -27,6 +28,7 @@ build:ubuntu1604_gcc5:
# extends: # extends:
# - .ubuntu1604_cuda # - .ubuntu1604_cuda
# - .cmake_test_linux # - .cmake_test_linux
# - .only-default
# dependencies: # dependencies:
# - build:ubuntu1604_gcc5 # - build:ubuntu1604_gcc5
# needs: # needs:
@ -42,6 +44,7 @@ build:ubuntu1604_gcc5:
# extends: # extends:
# - .ubuntu1804_cuda # - .ubuntu1804_cuda
# - .cmake_test_linux # - .cmake_test_linux
# - .only-default
# dependencies: # dependencies:
# - build:ubuntu1604_gcc5 # - build:ubuntu1604_gcc5
# needs: # needs:
@ -61,6 +64,7 @@ build:ubuntu1604_gcc48:
#enough CMake version that supports mpi #enough CMake version that supports mpi
- .ubuntu1604_cuda - .ubuntu1604_cuda
- .cmake_build_linux - .cmake_build_linux
- .only-default
variables: variables:
CMAKE_BUILD_TYPE: Release CMAKE_BUILD_TYPE: Release
#custom openmpi install location #custom openmpi install location
@ -76,6 +80,7 @@ test:ubuntu1604_gcc48:
extends: extends:
- .ubuntu1604 - .ubuntu1604
- .cmake_test_linux - .cmake_test_linux
- .only-default
variables: variables:
#env flags to allow openmpi to run as root user #env flags to allow openmpi to run as root user
OMPI_ALLOW_RUN_AS_ROOT: 1 OMPI_ALLOW_RUN_AS_ROOT: 1

@ -11,6 +11,7 @@ build:ubuntu1804_gcc9:
extends: extends:
- .ubuntu1804 - .ubuntu1804
- .cmake_build_linux - .cmake_build_linux
- .only-default
variables: variables:
CC: "gcc-9" CC: "gcc-9"
CXX: "g++-9" CXX: "g++-9"
@ -26,6 +27,7 @@ test:ubuntu1804_gcc9:
extends: extends:
- .ubuntu1804 - .ubuntu1804
- .cmake_test_linux - .cmake_test_linux
- .only-default
dependencies: dependencies:
- build:ubuntu1804_gcc9 - build:ubuntu1804_gcc9
needs: needs:
@ -44,6 +46,7 @@ build:ubuntu1804_gcc7:
extends: extends:
- .ubuntu1804_cuda - .ubuntu1804_cuda
- .cmake_build_linux - .cmake_build_linux
- .only-default
variables: variables:
CC: "gcc-7" CC: "gcc-7"
CXX: "g++-7" CXX: "g++-7"
@ -60,6 +63,7 @@ test:ubuntu1804_gcc7:
extends: extends:
- .ubuntu1804_cuda - .ubuntu1804_cuda
- .cmake_test_linux - .cmake_test_linux
- .only-default
dependencies: dependencies:
- build:ubuntu1804_gcc7 - build:ubuntu1804_gcc7
needs: needs:
@ -76,6 +80,7 @@ build:ubuntu1804_clang8:
extends: extends:
- .ubuntu1804 - .ubuntu1804
- .cmake_build_linux - .cmake_build_linux
- .only-default
variables: variables:
CC: "clang-8" CC: "clang-8"
CXX: "clang++-8" CXX: "clang++-8"
@ -91,6 +96,7 @@ test:ubuntu1804_clang8:
extends: extends:
- .ubuntu1804 - .ubuntu1804
- .cmake_test_linux - .cmake_test_linux
- .only-default
dependencies: dependencies:
- build:ubuntu1804_clang8 - build:ubuntu1804_clang8
needs: needs:

@ -117,6 +117,7 @@ build:ubuntu2004_$<compiler>:
extends: extends:
- .ubuntu2004 - .ubuntu2004
- .cmake_build_linux - .cmake_build_linux
- .only-default
variables: variables:
CC: "$<c-compiler-command>" CC: "$<c-compiler-command>"
CXX: "$<cxx-compiler-command>" CXX: "$<cxx-compiler-command>"
@ -176,6 +177,7 @@ test:ubuntu2004_$<compiler>:
extends: extends:
- .ubuntu2004_cuda - .ubuntu2004_cuda
- .cmake_test_linux - .cmake_test_linux
- .only-default
dependencies: dependencies:
- build:ubuntu2004_$<compiler> - build:ubuntu2004_$<compiler>
needs: needs: