CI: remove redundant plan_satapi job

.gitlab-ci.yml

@@ -110,7 +110,7 @@ docker_push:
     - if [ $CI_COMMIT_BRANCH == "master" ]; then docker push $IMAGE:latest; fi
 
 # Any newly-pushed, WIP branch will be ran through plan (keep in mind docker images are using the latest tag, which may be an older one since the current commit may not match an available image)
-plan_satapi:
+plan_staging:
   stage: plan
   tags:
     - k8s
@@ -120,6 +120,7 @@ plan_satapi:
     - cleanup_staging@satellite/ionosphere
     - /^staging_.*/
     - /^prod_.*/
+    - /^testnet_prod_.*/
     - /^misc_.*/
   script:
     - (cd terraform
@@ -146,95 +147,6 @@ plan_satapi:
          -var "station2=$STATION_2"
          -input=false)
 
-# This plan gets triggered only for miscellaneous branches/tags (i.e. tor, prometheus, etc), so make sure the branch/tag name starts with misc_
-plan_misc:
-  stage: plan
-  tags:
-    - k8s
-  only:
-    - /^misc_v.*/
-  script:
-    - (echo -n "$V3_PK" > terraform/modules/tor/v3.pk)
-    - (echo -n "$V3_PUBK" > terraform/modules/tor/v3.pubk)
-    - (cd terraform
-      && terraform init -input=false
-      && terraform workspace select misc
-      && terraform init -input=false
-      && terraform plan
-        -var "region=$REGION"
-        -var "zone=$ZONE"
-        -var "instance_type=$INSTANCE_TYPE"
-        -var "onion_host=$ONION_HOST"
-        -var "prom_allowed_source_ip=$PROMETHEUS_ALLOWED_SOURCE_IP"
-        -var "prom_service_acct=$PROM_SA"
-        -var "opsgenie_key=$OPSGENIE_KEY"
-        -var "satellite_lb=$SATELLITE_LB"
-        -var "satellite_api_lb=$SATELLITE_API_LB"
-        -var "satellite_api_lb_staging=$SATELLITE_API_LB_STAGING"
-        -var "blocksat_monitoring=$BLOCKSAT_MONITORING_LB"
-        -input=false)
-
-# This deploys only tags/branches starting with misc_v.* (i.e. tor, prometheus, etc)
-deploy_misc:
-  stage: deploy
-  when: manual
-  tags:
-    - k8s
-  only:
-    - /^misc_v.*/
-  script:
-    - (echo -n "$V3_PK" > terraform/modules/tor/v3.pk)
-    - (echo -n "$V3_PUBK" > terraform/modules/tor/v3.pubk)
-    - (cd terraform
-      && terraform init -input=false
-      && terraform workspace select misc
-      && terraform init -input=false
-      && terraform apply
-        -var "region=$REGION"
-        -var "zone=$ZONE"
-        -var "instance_type=$INSTANCE_TYPE"
-        -var "onion_host=$ONION_HOST"
-        -var "prom_allowed_source_ip=$PROMETHEUS_ALLOWED_SOURCE_IP"
-        -var "prom_service_acct=$PROM_SA"
-        -var "opsgenie_key=$OPSGENIE_KEY"
-        -var "satellite_lb=$SATELLITE_LB"
-        -var "satellite_api_lb=$SATELLITE_API_LB"
-        -var "satellite_api_lb_staging=$SATELLITE_API_LB_STAGING"
-        -var "blocksat_monitoring=$BLOCKSAT_MONITORING_LB"
-        -input=false -auto-approve)
-
-# Tag with staging_v.* to plan mainnet + LB to staging (e.g. staging_v0.1.1)
-plan_staging:
-  stage: plan
-  tags:
-    - k8s
-  only:
-    - /^staging_v.*/
-  script:
-    - (cd terraform
-       && terraform init -input=false
-       && terraform workspace select staging
-       && terraform init -input=false
-       && terraform plan
-         -var "ionosphere_docker=$API_IMAGE:$CI_COMMIT_SHA"
-         -var "ionosphere_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-         -var "region=$REGION"
-         -var "zone=$ZONE"
-         -var "instance_type=$INSTANCE_TYPE"
-         -var "host=$HOST_STAGING"
-         -var "timeout=$TIMEOUT"
-         -var "prom_service_acct=$PROM_SA"
-         -var "opsgenie_key=$OPSGENIE_KEY"
-         -var "public_bucket_url=$PUBLIC_BUCKET_URL"
-         -var "private_bucket=$PRIVATE_BUCKET"
-         -var "letsencrypt_email=$LE_EMAIL"
-         -var "charge_token=$CHARGE_TOKEN"
-         -var "rpcpass=$RPCPASS"
-         -var "k8s_autossh_lb=$GKE_LB"
-         -var "station1=$STATION_1"
-         -var "station2=$STATION_2"
-         -input=false)
-
 # Tag with staging_v.* to deploy mainnet + LB to staging (e.g. staging_v0.1.1)
 deploy_staging:
   stage: deploy
@@ -392,6 +304,63 @@ deploy_production_testnet:
          -var "k8s_autossh_lb=$GKE_LB"
          -input=false -auto-approve)
 
+# This plan gets triggered only for miscellaneous branches/tags (i.e. tor, prometheus, etc), so make sure the branch/tag name starts with misc_
+plan_misc:
+  stage: plan
+  tags:
+    - k8s
+  only:
+    - /^misc_v.*/
+  script:
+    - (echo -n "$V3_PK" > terraform/modules/tor/v3.pk)
+    - (echo -n "$V3_PUBK" > terraform/modules/tor/v3.pubk)
+    - (cd terraform
+      && terraform init -input=false
+      && terraform workspace select misc
+      && terraform init -input=false
+      && terraform plan
+        -var "region=$REGION"
+        -var "zone=$ZONE"
+        -var "instance_type=$INSTANCE_TYPE"
+        -var "onion_host=$ONION_HOST"
+        -var "prom_allowed_source_ip=$PROMETHEUS_ALLOWED_SOURCE_IP"
+        -var "prom_service_acct=$PROM_SA"
+        -var "opsgenie_key=$OPSGENIE_KEY"
+        -var "satellite_lb=$SATELLITE_LB"
+        -var "satellite_api_lb=$SATELLITE_API_LB"
+        -var "satellite_api_lb_staging=$SATELLITE_API_LB_STAGING"
+        -var "blocksat_monitoring=$BLOCKSAT_MONITORING_LB"
+        -input=false)
+
+# This deploys only tags/branches starting with misc_v.* (i.e. tor, prometheus, etc)
+deploy_misc:
+  stage: deploy
+  when: manual
+  tags:
+    - k8s
+  only:
+    - /^misc_v.*/
+  script:
+    - (echo -n "$V3_PK" > terraform/modules/tor/v3.pk)
+    - (echo -n "$V3_PUBK" > terraform/modules/tor/v3.pubk)
+    - (cd terraform
+      && terraform init -input=false
+      && terraform workspace select misc
+      && terraform init -input=false
+      && terraform apply
+        -var "region=$REGION"
+        -var "zone=$ZONE"
+        -var "instance_type=$INSTANCE_TYPE"
+        -var "onion_host=$ONION_HOST"
+        -var "prom_allowed_source_ip=$PROMETHEUS_ALLOWED_SOURCE_IP"
+        -var "prom_service_acct=$PROM_SA"
+        -var "opsgenie_key=$OPSGENIE_KEY"
+        -var "satellite_lb=$SATELLITE_LB"
+        -var "satellite_api_lb=$SATELLITE_API_LB"
+        -var "satellite_api_lb_staging=$SATELLITE_API_LB_STAGING"
+        -var "blocksat_monitoring=$BLOCKSAT_MONITORING_LB"
+        -input=false -auto-approve)
+
 # Pushing to this branch destroys the staging infrastructure
 cleanup_staging:
   stage: deploy