From: Jordan Petridis <jordan@centricular.com>
Date: Wed, 9 Sep 2020 13:00:54 +0000 (+0300)
Subject: ci_template: correctly spell the global var
X-Git-Tag: 1.19.3~497^2~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd43637fcea3ea76f2eb4af7cec237fe090fb768;p=platform%2Fupstream%2Fgstreamer.git

ci_template: correctly spell the global var

Close #83

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/337>
---

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index d36b4a4..f30bf55 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -328,14 +328,14 @@ manifest:
 
     # If the user that triggered the Pipeline is the Merge bot and the branch doesn't match
     # the upstream branch set, run the pipeline
-    - if: '$GITLAB_USER_LOGIN == "gstreamer-merge-bot" && $CI_COMMIT_BRANCH != "$GST_UPS_BRANCH"'
+    - if: '$GITLAB_USER_LOGIN == "gstreamer-merge-bot" && $CI_COMMIT_BRANCH != "$GST_UPSTREAM_BRANCH"'
     # When the user isn't the merge bot, require an explicit action to trigger the pipeline
     # to avoid wasting CI resources
     - if: '$GITLAB_USER_LOGIN != "gstreamer-merge-bot"'
       when: 'manual'
     # If this matches, it means the pipeline is running against either the main
     # or a stable branch, so make it manual
-    - if: '$CI_COMMIT_BRANCH == "$GST_UPS_BRANCH"'
+    - if: '$CI_COMMIT_BRANCH == "$GST_UPSTREAM_BRANCH"'
       when: 'manual'
 
   stage: 'preparation'