fixed rules for dev and app environments

Author: briancaffey

gitlab-ci/aws/app.yml

@@ -1,25 +1,40 @@
-workflow:
+.base_app_env: &base_app_env
+  variables:
+    ENVIRONMENT: app
+    # DB_SNAPSHOT_ID:
+
+.workflow_app: &app_settings
+  <<: *base_app_env
   rules:
-    - if: $CI_COMMIT_TAG
+    - if: "$CI_COMMIT_TAG =~ /^v/"
       when: always
 
-variables:
-  ENVIRONMENT: app
+.manual_job_app: &manual_app_settings
+  <<: *base_app_env
+  rules:
+    - if: "$CI_COMMIT_TAG =~ /^v/"
+      when: manual
 
 quasar_build_pwa (app):
+  <<: *app_settings
   extends: .quasar_build_pwa
 
 cdk_deploy (app):
+  <<: *app_settings
   extends: .cdk_deploy
 
 collectstatic (app):
+  <<: *manual_app_settings
   extends: .collectstatic
 
 migrate (app):
+  <<: *manual_app_settings
   extends: .migrate
 
 createsuperuser (app):
+  <<: *manual_app_settings
   extends: .createsuperuser
 
 cdk_destroy (app):
+  <<: *manual_app_settings
   extends: .cdk_destroy

gitlab-ci/aws/dev.yml

@@ -1,25 +1,41 @@
-workflow:
+.base_dev_env: &base_dev_env
+  variables:
+    ENVIRONMENT: dev
+    # RDS_INSTANCE_SIZE:
+    # DB_SNAPSHOT_ID:
+
+.workflow_dev: &dev_settings
+  <<: *base_dev_env
   rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: "$CI_COMMIT_TAG =~ /^rc/"
       when: always
 
-variables:
-  ENVIRONMENT: dev
+.manual_job_dev: &manual_dev_settings
+  <<: *base_dev_env
+  rules:
+    - if: "$CI_COMMIT_TAG =~ /^rc/"
+      when: manual
 
 quasar_build_pwa (dev):
+  <<: *dev_settings
   extends: .quasar_build_pwa
 
 cdk_deploy (dev):
+  <<: *manual_dev_settings
   extends: .cdk_deploy
 
 collectstatic (dev):
+  <<: *manual_dev_settings
   extends: .collectstatic
 
 migrate (dev):
+  <<: *manual_dev_settings
   extends: .migrate
 
 createsuperuser (dev):
+  <<: *manual_dev_settings
   extends: .createsuperuser
 
 cdk_destroy (dev):
+  <<: *manual_dev_settings
   extends: .cdk_destroy