summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-04-27 13:41:22 -0400
committerMicah Anderson <micah@riseup.net>2017-04-27 13:43:19 -0400
commit8bc60685875e2eb289d0d860ebe7ba7839eb20e2 (patch)
tree0dcfa0e8f815ba0fb85af91395074db35fd32e27
parenta577fbf20357ae1bc611da975cde001ef9dfa310 (diff)
change environment names to match ci-build.sh
-rw-r--r--.gitlab-ci.yml4
-rwxr-xr-xtests/platform-ci/ci-build.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b0f8852..a1ad49a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,7 @@ ci.leap.se:
demo.bitmask.net:
stage: deploy
environment:
- name: production/vpn
+ name: production/demo/vpn
only:
- master
when: manual
@@ -89,7 +89,7 @@ demo.bitmask.net:
mail.bitmask.net:
stage: deploy
environment:
- name: production/mail
+ name: production/demo/mail
only:
- master
when: manual
diff --git a/tests/platform-ci/ci-build.sh b/tests/platform-ci/ci-build.sh
index 747e09a7..34876a73 100755
--- a/tests/platform-ci/ci-build.sh
+++ b/tests/platform-ci/ci-build.sh
@@ -144,11 +144,11 @@ case "$CI_ENVIRONMENT_NAME" in
TAG='latest'
run ibex ssh://gitolite@leap.se/ibex
;;
- demo/mail)
+ production/demo/mail)
TAG='demomail'
run bitmask ssh://gitolite@leap.se/bitmask
;;
- demo/vpn)
+ production/demo/vpn)
TAG='demovpn'
run bitmask ssh://gitolite@leap.se/bitmask
;;