From 67603d04ca2e4123b7018e240ddc87f0eda99a59 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Wed, 8 Mar 2017 20:39:43 +0100
Subject: [PATCH 1/2] Simplify trigger_docs build job for CE and EE (!9820)

---
 .gitlab-ci.yml                                  | 3 ++-
 changelogs/unreleased/simplify-docs-trigger.yml | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/simplify-docs-trigger.yml

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

From acbb8c0ff0103b2dc4138384b7be2d51bdf7e337 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Thu, 9 Mar 2017 21:52:47 +0100
Subject: [PATCH 2/2] Fail trigger_docs if triggering build was not successful

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03292302a5b..3cea727f811 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -389,7 +389,8 @@ trigger_docs:
   cache: {}
   artifacts: {}
   script:
-    - "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"
+    - "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