ci: stop automatically running tests post-merge

[platform/upstream/gstreamer.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f0d0b2..bc06c49 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,9 +25,9 @@ variables:
   # If you are hacking on them or need a them to rebuild, its enough
   # to change any part of the string of the image you want.
   ###
-  FEDORA_TAG:  '2021-12-03.1'
+  FEDORA_TAG:  '2022-03-14.0'
   INDENT_TAG: '2021-10-04.0'
-  WINDOWS_TAG: "2022-01-26.3"
+  WINDOWS_TAG: "2022-03-14.0"
 
   GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
   FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
@@ -123,8 +123,9 @@ trigger:
   rules:
     # If the MR is assigned to the Merge bot, trigger the pipeline automatically
     - if: '$CI_MERGE_REQUEST_ASSIGNEES == "gstreamer-merge-bot"'
-    # Alway run tests post merged
+    # Require explicit action to trigger tests post merge
     - if: '$CI_PROJECT_NAMESPACE == "gstreamer" && $CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
+      when: 'manual'
     # When the assignee isn't the merge bot, require an explicit action to trigger the pipeline
     # to avoid wasting CI resources
     - if: '$CI_MERGE_REQUEST_ASSIGNEES != "gstreamer-merge-bot"'
@@ -167,6 +168,7 @@ windows amd64 docker:
   stage: "build docker"
   needs:
     - "trigger"
+  timeout: '3h'
   variables:
     # Unlike the buildah/linux jobs, this file
     # needs to be relative to docker/windows/ subdir
@@ -682,6 +684,7 @@ valgrind ges:
       - subprojects/gst-plugins-good/**/*
       - subprojects/gst-plugins-bad/**/*
       - subprojects/gst-editing-services/**/*
+      - subprojects/gst-python/**/*
 
 # ---- Integration ----- #
 
@@ -760,6 +763,8 @@ build documentation:
 cerbero trigger:
   stage: build
   timeout: '3h'
+  tags:
+    - placeholder-job
   extends:
     - '.fedora image'
     - '.fdo.suffixed-image@fedora'