Verified Commit 35fe0316 authored by Maarten de Waard's avatar Maarten de Waard
Browse files

use CI_MERGE_REQUEST_SOURCE_BRANCH_NAME in case CI_COMMIT_BS_BRANCH is empty

parent d2800bc4
......@@ -271,15 +271,18 @@ terminate-droplet:
# Gets triggered by on_stop of create-vps job
rules:
# Run manually for pre-release branches
- if: '$CI_COMMIT_BRANCH =~ /^pre-release-.*$/'
- if: '$CI_COMMIT_BRANCH =~ /^pre-release/'
when: manual
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^pre-release/'
when: manual
# TODO Remove this:
# For testing the above
- if: '$CI_COMMIT_BRANCH =~ /^961-.*$/'
- if: '$CI_COMMIT_BRANCH =~ /^961-/'
when: manual
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^961-/'
when: manual
# Use default behavior for all other branches
- if: '$CI_COMMIT_BRANCH !~ /^961-.*$/'
when: on_success
- when: on_success
variables:
GIT_STRATEGY: none
script:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment