Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
699e8970
Commit
699e8970
authored
May 03, 2021
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Openshift template to run on main branch
This commit fixes the outdated openshift template.
parent
4d9aabd2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
14 deletions
+15
-14
changelogs/unreleased/fix-openshift-template-to-run-on-main-branch.yml
...released/fix-openshift-template-to-run-on-main-branch.yml
+5
-0
lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml
lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml
+10
-14
No files found.
changelogs/unreleased/fix-openshift-template-to-run-on-main-branch.yml
0 → 100644
View file @
699e8970
---
title
:
Fix Openshift template to run on main branch
merge_request
:
60811
author
:
type
:
fixed
lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml
View file @
699e8970
...
...
@@ -46,27 +46,23 @@ review:
name
:
review/$CI_COMMIT_REF_NAME
url
:
http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
on_stop
:
stop-review
only
:
-
branches
except
:
-
master
rules
:
-
if
:
$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
stop-review
:
<<
:
*deploy
stage
:
cleanup
script
:
-
oc delete all -l "app=$APP"
when
:
manual
variables
:
APP
:
review-$CI_COMMIT_REF_NAME
GIT_STRATEGY
:
none
environment
:
name
:
review/$CI_COMMIT_REF_NAME
action
:
stop
only
:
-
branches
except
:
-
master
rules
:
-
if
:
$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
when
:
manual
staging
:
<<
:
*deploy
...
...
@@ -77,8 +73,8 @@ staging:
environment
:
name
:
staging
url
:
http://$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
only
:
-
master
rules
:
-
if
:
$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
production
:
<<
:
*deploy
...
...
@@ -86,9 +82,9 @@ production:
variables
:
APP
:
production
APP_HOST
:
$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
when
:
manual
environment
:
name
:
production
url
:
http://$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
only
:
-
master
rules
:
-
if
:
$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when
:
manual
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment