diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
| commit | 123c68a7cf788ace140e57e478a12c5b7ac893ae (patch) | |
| tree | b36e565ecd895ee46c1713f3734308cfce0e6ba9 /scripts/sync-stable-branch.sh | |
| parent | 862d225ca0d8eb452e56b8fe5a0109aac796e872 (diff) | |
| download | gitlab-ce-123c68a7cf788ace140e57e478a12c5b7ac893ae.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/sync-stable-branch.sh')
| -rw-r--r-- | scripts/sync-stable-branch.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/sync-stable-branch.sh b/scripts/sync-stable-branch.sh index fc62453d743..b44bf26a151 100644 --- a/scripts/sync-stable-branch.sh +++ b/scripts/sync-stable-branch.sh @@ -23,10 +23,24 @@ then exit 1 fi +if [[ "$SOURCE_PROJECT" == '' ]] +then + echo 'The variable SOURCE_PROJECT must be set to a non-empy value' + exit 1 +fi + +if [[ "$TARGET_PROJECT" == '' ]] +then + echo 'The variable TARGET_PROJECT must be set to a non-empy value' + exit 1 +fi + curl -X POST \ -F token="$MERGE_TRAIN_TRIGGER_TOKEN" \ -F ref=master \ -F "variables[MERGE_FOSS]=1" \ -F "variables[SOURCE_BRANCH]=$CI_COMMIT_REF_NAME" \ -F "variables[TARGET_BRANCH]=${CI_COMMIT_REF_NAME/-ee/}" \ + -F "variables[SOURCE_PROJECT]=$SOURCE_PROJECT" \ + -F "variables[TARGET_PROJECT]=$TARGET_PROJECT" \ "$MERGE_TRAIN_TRIGGER_URL" |