summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-10-26 13:25:56 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-10-26 13:25:56 +0000
commit609f474804e4c13c92863678caecaee5f83b3322 (patch)
treeae4d7be63eb4bf286329359458fdf67a552a6cc4
parent0e544db657ecd2d5497bb6ff47a04fe128ca4ec2 (diff)
parent737426331baf0c5b78f9927c3e2029ed8b9a91f9 (diff)
downloadgitlab-ce-609f474804e4c13c92863678caecaee5f83b3322.tar.gz
Merge branch 'docs-trigger-variable' into 'master'
Add a trigger variable to docs trigger job See merge request !7089
-rw-r--r--.gitlab-ci.yml11
1 files changed, 8 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 474bf6765f4..6a1dd054d99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -311,15 +311,20 @@ coverage:
- coverage/assets/
# Trigger docs build
+# https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/README.md#deployment-process
trigger_docs:
stage: post-test
- before_script: []
+ image: "alpine"
+ before_script:
+ - apk update && apk add curl
+ variables:
+ GIT_STRATEGY: none
cache: {}
artifacts: {}
script:
- - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master https://gitlab.com/api/v3/projects/38069/trigger/builds"
+ - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ce https://gitlab.com/api/v3/projects/38069/trigger/builds"
only:
- - master
+ - master@gitlab-org/gitlab-ce
# Notify slack in the end