Merge topic 'enable-hip-builds-master-release'

f6a9e3631 CI: enable HIP builds on protected branches
c5dd07d97 CI: run_master -> run_upstream_branches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2837

.gitlab-ci.yml

@@ -126,9 +126,9 @@
       when: on_success
     - when: never
 
-.run_master: &run_master
+.run_upstream_branches: &run_upstream_branches
   rules:
-    - if: '$CI_PROJECT_PATH == "vtk/vtk-m" && $CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_PROJECT_PATH == "vtk/vtk-m" && $CI_MERGE_REQUEST_ID == null'
       when: on_success
     - when: never
 

.gitlab/ci/ubuntu1604.yml

@@ -50,7 +50,7 @@ build:ubuntu1604_gcc5_2:
   extends:
     - .ubuntu1604_cuda
     - .cmake_build_linux
-    - .run_master
+    - .run_upstream_branches
     - .use_minimum_supported_cmake
   variables:
     CC: "gcc-5"
@@ -69,7 +69,7 @@ test:ubuntu1804_test_ubuntu1604_gcc5_2:
   extends:
     - .ubuntu1804_cuda
     - .cmake_test_linux
-    - .run_master
+    - .run_upstream_branches
   variables:
       CTEST_EXCLUSIONS: "built_against_test_install"
   dependencies:

.gitlab/ci/ubuntu1804.yml

@@ -91,7 +91,7 @@ build:ubuntu1804_clang_cuda:
     - .ubuntu1804_cuda
     - .cmake_build_linux
     - .run_automatically
-    # - .run_master
+    # - .run_upstream_branches
   variables:
     CC: "clang-8"
     CXX: "clang++-8"
@@ -110,7 +110,7 @@ test:ubuntu1804_clang_cuda:
     - .ubuntu1804_cuda
     - .cmake_test_linux
     - .run_automatically
-    # - .run_master
+    # - .run_upstream_branches
   dependencies:
     - build:ubuntu1804_clang_cuda
   needs:

.gitlab/ci/ubuntu2004.yml

@@ -69,7 +69,7 @@ build:ubuntu2004_hip_kokkos:
   extends:
     - .ubuntu2004_hip_kokkos
     - .cmake_build_linux
-    - .run_scheduled
+    - .run_upstream_branches
   variables:
     CMAKE_BUILD_TYPE: RelWithDebInfo
     VTKM_SETTINGS: "benchmarks+kokkos+hip+no_virtual+no_rendering+ccache"
@@ -96,7 +96,7 @@ test:ubuntu2004_hip_kokkos:
   extends:
     - .ubuntu2004_hip_kokkos
     - .cmake_test_linux
-    - .run_scheduled
+    - .run_upstream_branches
   variables:
     CTEST_TIMEOUT: "30"
   dependencies: