From 5c19f09a75d13114ff1c7a889edc31f3155f2973 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axil@gitlab.com>
Date: Wed, 4 Jul 2018 11:58:26 +0200
Subject: Use CI_COMMIT_REF_SLUG for the env URL in review-docs jobs
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to '.gitlab-ci.yml')
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8703ef6823a..2f61a2864f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,7 +269,7 @@ package-and-qa:
<<: *single-script-job-variables
SCRIPT_NAME: trigger-build-docs
environment:
- name: review-docs/$CI_COMMIT_REF_NAME
+ name: review-docs/$CI_COMMIT_REF_SLUG
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are secret variables
# Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693
url: http://$DOCS_GITLAB_REPO_SUFFIX-$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
@@ -305,7 +305,7 @@ review-docs-cleanup:
<<: *review-docs
stage: post-cleanup
environment:
- name: review-docs/$CI_COMMIT_REF_NAME
+ name: review-docs/$CI_COMMIT_REF_SLUG
action: stop
when: manual
script:
--
cgit v1.2.1
From 72fa064000a5434456544568325ee7b583dbef90 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axil@gitlab.com>
Date: Wed, 4 Jul 2018 12:26:52 +0200
Subject: Simplify downstream branch name
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to '.gitlab-ci.yml')
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f61a2864f9..caf30093229 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -272,7 +272,7 @@ package-and-qa:
name: review-docs/$CI_COMMIT_REF_SLUG
# DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are secret variables
# Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693
- url: http://$DOCS_GITLAB_REPO_SUFFIX-$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
+ url: http://$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
on_stop: review-docs-cleanup
# Trigger a manual docs build in gitlab-docs only on non docs-only branches.
--
cgit v1.2.1