ci: remove duplicate stage key in documentation job

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d655aea..35ed479 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 include:
-  - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/14731f78c23c7b523a85a26a068ade9ac1ecd2f3/templates/ci-fairy.yml"
   - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/14731f78c23c7b523a85a26a068ade9ac1ecd2f3/templates/fedora.yml"
   - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/14731f78c23c7b523a85a26a068ade9ac1ecd2f3/templates/debian.yml"
 
@@ -24,7 +23,7 @@ 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-10-04.0'
+  FEDORA_TAG:  '2021-10-05.0'
   INDENT_TAG: '2021-10-04.0'
   WINDOWS_TAG: "2021-10-04.1"
 
@@ -255,18 +254,6 @@ gst indent:
       fi
 
 #
-# Check "allow-edit" checkbox on merge requests with ci-fairy
-#
-check allow-edit:
-  extends: '.fdo.ci-fairy'
-  needs: []
-  stage: 'preparation'
-  script:
-    - ci-fairy check-merge-request --require-allow-collaboration
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-
-#
 # build setup templates
 #
 .build_template: &build
@@ -736,8 +723,6 @@ build documentation:
   stage: build
   needs:
     - "trigger"
-
-  stage: build
   rules:
     - changes:
       - .gitlab-ci.yml
@@ -760,17 +745,14 @@ build documentation:
 # https://gitlab.com/gitlab-org/gitlab/-/issues/341737
 cerbero trigger:
   stage: build
-  image: $FEDORA_IMAGE
+  extends:
+    - '.fedora image'
+    - '.fdo.suffixed-image@fedora'
   needs:
     - "fedora amd64 docker"
   script:
-    - python3 -m pip install --user python-gitlab
     - ci/gitlab/trigger_cerbero_pipeline.py
 
-  variables:
-    # Use GST_UPSTREAM_BRANCH
-    UPSTREAM_BRANCH: 'main'
-
   rules:
     - changes:
       - .gitlab-ci.yml