diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-03-20 20:04:48 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-03-20 20:04:48 +0000 |
| commit | fc2f0eba32b3c1b942a7bf9428ffe10a1dca31f5 (patch) | |
| tree | 62038fa61279bd89b74bdd31aa53ebfd82fb9ada | |
| parent | 0ebf97b015a9f011e7c3e3b9303bd2799b2b427d (diff) | |
| parent | acbb8c0ff0103b2dc4138384b7be2d51bdf7e337 (diff) | |
| download | gitlab-ce-fc2f0eba32b3c1b942a7bf9428ffe10a1dca31f5.tar.gz | |
Merge branch 'simplify-docs-trigger' into 'master'
Simplify trigger_docs build job for CE and EE
See merge request !9820
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/simplify-docs-trigger.yml | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 080d8cd6c7f..3cea727f811 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -389,9 +389,11 @@ trigger_docs: cache: {} artifacts: {} script: - - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ce https://gitlab.com/api/v3/projects/1794617/trigger/builds" + - "HTTP_STATUS=$(curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=${CI_PROJECT_NAME} --silent --output curl.log --write-out '%{http_code}' https://gitlab.com/api/v3/projects/1794617/trigger/builds)" + - if [ "${HTTP_STATUS}" -ne "201" ]; then echo "Error ${HTTP_STATUS}"; cat curl.log; echo; exit 1; fi only: - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee # Notify slack in the end notify:slack: diff --git a/changelogs/unreleased/simplify-docs-trigger.yml b/changelogs/unreleased/simplify-docs-trigger.yml new file mode 100644 index 00000000000..062626359ef --- /dev/null +++ b/changelogs/unreleased/simplify-docs-trigger.yml @@ -0,0 +1,4 @@ +--- +title: Simplify trigger_docs build job for CE and EE +merge_request: 9820 +author: winniehell |