From f4bb5dd0ad8fb5d6f766b8462aa6f58bb36d75b0 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 16 Feb 2017 10:04:55 +0100
Subject: [PATCH] Clarify that stage is needed to stop environments
[ci skip]
---
doc/ci/environments.md | 5 ++++-
doc/ci/yaml/README.md | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index 3bba94f8b83..3c31ba45d3d 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -535,6 +535,7 @@ deploy_review:
- master
stop_review:
+ stage: deploy
variables:
GIT_STRATEGY: none
script:
@@ -555,7 +556,9 @@ when their associated branch is deleted.
When you have an environment that has a stop action defined (typically when
the environment describes a review app), GitLab will automatically trigger a
-stop action when the associated branch is deleted.
+stop action when the associated branch is deleted. The `stop_review` job must
+be in the same `stage` as the `deploy_review` one in order for the environment
+to automatically stop.
You can read more in the [`.gitlab-ci.yml` reference][onstop].
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 63be61d1bca..a73598df812 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -690,6 +690,8 @@ The `stop_review_app` job is **required** to have the following keywords defined
- `when` - [reference](#when)
- `environment:name`
- `environment:action`
+- `stage` should be the same as the `review_app` in order for the environment
+ to stop automatically when the branch is deleted
#### dynamic environments
--
GitLab