From cbed21696db50f5c8dca9fdb81ce0b5eea935004 Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Mon, 30 Mar 2020 09:51:45 -0400
Subject: [PATCH] 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
---
 .gitlab-ci.yml            | 9 +++++++++
 .gitlab/ci/centos7.yml    | 3 +++
 .gitlab/ci/rhel8.yml      | 2 ++
 .gitlab/ci/ubuntu1604.yml | 5 +++++
 .gitlab/ci/ubuntu1804.yml | 6 ++++++
 docs/CI-README.md         | 2 ++
 6 files changed, 27 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ac940791..a687c107c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,6 +68,15 @@
   extends:
     - .docker_image
 
+.only-default: &only-default
+  only:
+    - master
+    - merge_requests
+    - tags
+
+.only-master: &only-master
+  only:
+    - master
 
 # General Longer Term Tasks:
 # - setup asan, and ubsan as sub-pipeline
diff --git a/.gitlab/ci/centos7.yml b/.gitlab/ci/centos7.yml
index 4ca983170..e7b861a52 100644
--- a/.gitlab/ci/centos7.yml
+++ b/.gitlab/ci/centos7.yml
@@ -11,6 +11,7 @@ build:centos7_gcc48:
   extends:
     - .centos7
     - .cmake_build_linux
+    - .only-default
   variables:
     CMAKE_BUILD_TYPE: RelWithDebInfo
     CMAKE_GENERATOR: "Unix Makefiles"
@@ -27,6 +28,7 @@ test:centos7_gcc48:
   extends:
     - .centos7
     - .cmake_test_linux
+    - .only-default
   dependencies:
     - build:centos7_gcc48
   needs:
@@ -43,6 +45,7 @@ test:rhel8_test_centos7:
   extends:
     - .rhel8
     - .cmake_test_linux
+    - .only-default
   dependencies:
     - build:centos7_gcc48
   needs:
diff --git a/.gitlab/ci/rhel8.yml b/.gitlab/ci/rhel8.yml
index add614942..5ae77381b 100644
--- a/.gitlab/ci/rhel8.yml
+++ b/.gitlab/ci/rhel8.yml
@@ -10,6 +10,7 @@ build:rhel8:
   extends:
     - .rhel8
     - .cmake_build_linux
+    - .only-default
   variables:
     CMAKE_GENERATOR: "Unix Makefiles"
     VTKM_SETTINGS: "serial+shared+64bit_floats+32bit_ids"
@@ -23,6 +24,7 @@ test:rhel8:
   extends:
     - .rhel8
     - .cmake_test_linux
+    - .only-default
   dependencies:
     - build:rhel8
   needs:
diff --git a/.gitlab/ci/ubuntu1604.yml b/.gitlab/ci/ubuntu1604.yml
index cbb9758a1..707fb0c54 100644
--- a/.gitlab/ci/ubuntu1604.yml
+++ b/.gitlab/ci/ubuntu1604.yml
@@ -11,6 +11,7 @@ build:ubuntu1604_gcc5:
   extends:
     - .ubuntu1604_cuda
     - .cmake_build_linux
+    - .only-default
   variables:
     CMAKE_BUILD_TYPE: RelWithDebInfo
     VTKM_SETTINGS: "cuda+pascal"
@@ -27,6 +28,7 @@ build:ubuntu1604_gcc5:
 #   extends:
 #     - .ubuntu1604_cuda
 #     - .cmake_test_linux
+#     - .only-default
 #   dependencies:
 #     - build:ubuntu1604_gcc5
 #   needs:
@@ -42,6 +44,7 @@ build:ubuntu1604_gcc5:
 #   extends:
 #     - .ubuntu1804_cuda
 #     - .cmake_test_linux
+#     - .only-default
 #   dependencies:
 #     - build:ubuntu1604_gcc5
 #   needs:
@@ -61,6 +64,7 @@ build:ubuntu1604_gcc48:
     #enough CMake version that supports mpi
     - .ubuntu1604_cuda
     - .cmake_build_linux
+    - .only-default
   variables:
     CMAKE_BUILD_TYPE: Release
     #custom openmpi install location
@@ -76,6 +80,7 @@ test:ubuntu1604_gcc48:
   extends:
     - .ubuntu1604
     - .cmake_test_linux
+    - .only-default
   variables:
     #env flags to allow openmpi to run as root user
     OMPI_ALLOW_RUN_AS_ROOT: 1
diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml
index 3788a5801..861da3384 100644
--- a/.gitlab/ci/ubuntu1804.yml
+++ b/.gitlab/ci/ubuntu1804.yml
@@ -11,6 +11,7 @@ build:ubuntu1804_gcc9:
   extends:
     - .ubuntu1804
     - .cmake_build_linux
+    - .only-default
   variables:
     CC: "gcc-9"
     CXX: "g++-9"
@@ -26,6 +27,7 @@ test:ubuntu1804_gcc9:
   extends:
     - .ubuntu1804
     - .cmake_test_linux
+    - .only-default
   dependencies:
     - build:ubuntu1804_gcc9
   needs:
@@ -44,6 +46,7 @@ build:ubuntu1804_gcc7:
   extends:
     - .ubuntu1804_cuda
     - .cmake_build_linux
+    - .only-default
   variables:
     CC: "gcc-7"
     CXX: "g++-7"
@@ -60,6 +63,7 @@ test:ubuntu1804_gcc7:
   extends:
     - .ubuntu1804_cuda
     - .cmake_test_linux
+    - .only-default
   dependencies:
     - build:ubuntu1804_gcc7
   needs:
@@ -76,6 +80,7 @@ build:ubuntu1804_clang8:
   extends:
     - .ubuntu1804
     - .cmake_build_linux
+    - .only-default
   variables:
     CC: "clang-8"
     CXX: "clang++-8"
@@ -91,6 +96,7 @@ test:ubuntu1804_clang8:
   extends:
     - .ubuntu1804
     - .cmake_test_linux
+    - .only-default
   dependencies:
     - build:ubuntu1804_clang8
   needs:
diff --git a/docs/CI-README.md b/docs/CI-README.md
index 902f31b97..da77324ed 100644
--- a/docs/CI-README.md
+++ b/docs/CI-README.md
@@ -117,6 +117,7 @@ build:ubuntu2004_$<compiler>:
   extends:
     - .ubuntu2004
     - .cmake_build_linux
+    - .only-default
   variables:
     CC: "$<c-compiler-command>"
     CXX: "$<cxx-compiler-command>"
@@ -176,6 +177,7 @@ test:ubuntu2004_$<compiler>:
   extends:
     - .ubuntu2004_cuda
     - .cmake_test_linux
+    - .only-default
   dependencies:
     - build:ubuntu2004_$<compiler>
   needs: