From ca02dda602b0f8d6c752f32ddb7784c241625fd5 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 28 Mar 2021 01:31:35 +0000
Subject: [PATCH] gitlab-ci: update for newer GitLab

We now have resource_groups, and environment.name. We don't yet have
environment.deployment_tier, though, but that can live in the base template and
be enabled once Heptapod is at GitLab 13.10.
---
 .gitlab-ci.yml | 56 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c86b15042..47416e8ea9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,79 +28,129 @@ nixCache:
       artifacts: true
   tags:
     - deployer
+#  environment:
+#    deployment_tier: production
 
 marukuru:
   extends: .deploy
-  #resource_group: marukuru
+  resource_group: marukuru
   script: './hack/deploy.sh "marukuru" "-p 20022"'
+  environment:
+    name: marukuru
 
 clouvider-fra01:
   extends: .deploy
-  #resource_group: clouvider-fra01
+  resource_group: clouvider-fra01
   script: './hack/deploy.sh "clouvider-fra01" ""'
+  environment:
+    name: clouvider-fra01
 
 kusakabe:
   extends: .deploy
-  #resource_group: kusakabe
+  resource_group: kusakabe
   script: './hack/deploy.sh "kusakabe" ""'
+  environment:
+    name: kusakabe
 
 clouvider-lon01:
   extends: .deploy
+  resource_group: clouvider-lon01
   script: './hack/deploy.sh "clouvider-lon01" ""'
+  environment:
+    name: clouvider-lon01
 
 totoro:
   extends: .deploy
+  resource_group: totoro
   script: './hack/deploy.sh "totoro" ""'
+  environment:
+    name: totoro
 
 swann:
   extends: .deploy
+  resource_group: swann
   script: './hack/deploy.sh "swann" ""'
+  environment:
+    name: swann
 
 etheroute-lon01:
   extends: .deploy
+  resource_group: etheroute-lon01
   script: './hack/deploy.sh "etheroute-lon01" ""'
+  environment:
+    name: etheroute-lon01
 
 blade-janeway:
   extends: .deploy
+  resource_group: blade-janeway
   script: './hack/deploy.sh "blade-janeway" ""'
+  environment:
+    name: blade-janeway
 
 # chakotay and kim are not autodeployed because they're usually off.
 #blade-chakotay:
 #  extends: .deploy
+#  resource_group: blade-chakotay
 #  script: './hack/deploy.sh "blade-chakotay" ""'
+#  environment:
+#    name: blade-chakotay
 #
 #blade-kim:
 #  extends: .deploy
+#  resource_group: blade-kim
 #  script: './hack/deploy.sh "blade-kim" ""'
+#  environment:
+#    name: blade-kim
 
 # paris and tuvok are not autodeployed because they are the routers, and I don't trust myself
 #blade-paris:
 #  extends: .deploy
+#  resource_group: blade-paris
 #  script: './hack/deploy.sh "blade-paris" ""'
+#  environment:
+#    name: blade-paris
 #
 #blade-tuvok:
 #  extends: .deploy
+#  resource_group: blade-tuvok
 #  script: './hack/deploy.sh "blade-tuvok" ""'
+#  environment:
+#    name: blade-tuvok
 
 blade-torres:
   extends: .deploy
+  resource_group: blade-torres
   script: './hack/deploy.sh "blade-torres" ""'
+  environment:
+    name: blade-torres
 
 bvm-nixosmgmt:
   extends: .deploy
+  resource_group: bvm-nixosmgmt
   script: './hack/deploy.sh "bvm-nixosmgmt" ""'
+  environment:
+    name: bvm-nixosmgmt
 
 frantech-las01:
   extends: .deploy
+  resource_group: frantech-las01
   script: './hack/deploy.sh "frantech-las01" ""'
+  environment:
+    name: frantech-las01
 
 frantech-lux01:
   extends: .deploy
+  resource_group: frantech-lux01
   script: './hack/deploy.sh "frantech-lux01" ""'
+  environment:
+    name: frantech-lux01
 
 frantech-nyc01:
   extends: .deploy
+  resource_group: frantech-nyc01
   script: './hack/deploy.sh "frantech-nyc01" ""'
+  environment:
+    name: frantech-nyc01
 
 docker-push:
   stage: deploy