Merge branch '27109-cleanup' into 'master'

Move stop_review to cleanup stage

Closes gitlab-ce#27109

See merge request !57

OpenShift.gitlab-ci.yml

@@ -5,6 +5,7 @@ stages:
   - review
   - staging
   - production
+  - cleanup
 variables:
   OPENSHIFT_SERVER: openshift.default.svc.cluster.local
@@ -50,7 +51,7 @@ review:
 stop-review:
   <<: *deploy
-  stage: review
+  stage: cleanup
   script:
     - oc delete all -l "app=$APP"
   when: manual

autodeploy/Kubernetes.gitlab-ci.yml

@@ -12,6 +12,7 @@ stages:
   - review
   - staging
   - production
+  - cleanup
 build:
   stage: build
@@ -61,7 +62,7 @@ review:
     - master
 stop_review:
-  stage: review
+  stage: cleanup
   variables:
     GIT_STRATEGY: none
   script:

autodeploy/OpenShift.gitlab-ci.yml

@@ -12,6 +12,7 @@ stages:
   - review
   - staging
   - production
+  - cleanup
 build:
   stage: build
@@ -61,7 +62,7 @@ review:
     - master
 stop_review:
-  stage: review
+  stage: cleanup
   variables:
     GIT_STRATEGY: none
   script: