summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwinniehell <git@winniehell.de>2017-03-08 20:39:43 +0100
committerwinniehell <git@winniehell.de>2017-03-20 13:42:09 +0100
commit67603d04ca2e4123b7018e240ddc87f0eda99a59 (patch)
treed2e2cf6ede643667cea43b27bce6006ad1f32175
parent9bfff603fe91f56b0355e102f5d62c8dccc1d9f8 (diff)
downloadgitlab-ce-67603d04ca2e4123b7018e240ddc87f0eda99a59.tar.gz
Simplify trigger_docs build job for CE and EE (!9820)
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--changelogs/unreleased/simplify-docs-trigger.yml4
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 080d8cd6c7f..03292302a5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -389,9 +389,10 @@ 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"
+ - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=${CI_PROJECT_NAME} https://gitlab.com/api/v3/projects/1794617/trigger/builds"
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