Skip to content
Snippets Groups Projects
Commit 0d742e8b authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

pipeline order

parent 5fc13d4b
No related branches found
No related tags found
2 merge requests!110Integration test,!90Develop
Pipeline #66366 passed with warnings
...@@ -8,6 +8,7 @@ build:docker: ...@@ -8,6 +8,7 @@ build:docker:
rules: rules:
- if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "develop"
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
script: script:
- > - >
docker build \ docker build \
...@@ -44,14 +45,14 @@ deploy:latest: ...@@ -44,14 +45,14 @@ deploy:latest:
deploy:merge-request:master: deploy:merge-request:master:
variables: variables:
TAG: $CI_REGISTRY_IMAGE:develop TAG: $CI_REGISTRY_IMAGE:mr-master
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
<<: *deploy <<: *deploy
deploy:merge-mr:develop: deploy:merge-mr:develop:
variables: variables:
TAG: $CI_REGISTRY_IMAGE:develop TAG: $CI_REGISTRY_IMAGE:mr-develop
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop' - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
<<: *deploy <<: *deploy
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment