🔨 Fix routing for review environment

nhsuk-archive · Aug 16, 2019 · 15c4aef · 15c4aef
1 parent f5f1d76
commit 15c4aef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/scripts/devops/get-vault-variables b/scripts/devops/get-vault-variables
@@ -1,15 +1,5 @@
 #!/bin/bash
 
-RANCHER_STACK_NAME=$PROJECT_NAME
-if [ -n "$PRID" ]; then
-  RANCHER_STACK_NAME="$RANCHER_STACK_NAME-pr-$PRID"
-fi
-# Set some defaults
-{
-  echo "RANCHER_STACK_NAME=$RANCHER_STACK_NAME"
-  echo "TRAEFIK_DOMAIN=nhswebsite-integration.nhs.uk"
-} >> answers.txt
-
 get_vault_data() {
   VAULT_PATH="$1"
 

diff --git a/scripts/devops/set-branch-variables b/scripts/devops/set-branch-variables
@@ -15,7 +15,15 @@ TAG=$(echo "$CLEANED_SOURCEBRANCH" | sed -E -n -e's:^refs-tags-(.+)$:\1:p')
 echo "TAG: $TAG"
 echo "##vso[task.setvariable variable=TAG]$TAG"
 
+RANCHER_STACK_NAME=$PROJECT_NAME
+if [ -n "$PRID" ]; then
+  RANCHER_STACK_NAME="$RANCHER_STACK_NAME-pr-$PRID"
+fi
+
+# Set some defaults
 {
+  echo "RANCHER_STACK_NAME=$RANCHER_STACK_NAME"
+  echo "TRAEFIK_DOMAIN=nhswebsite-integration.nhs.uk"
   echo "BRANCH=$BRANCH"
   echo "PRID=$PRID"
   echo "TAG=$TAG"