Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Make dev2 and prod2 compliant pipes. #123

Merged
merged 1 commit into from
Sep 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ variables:
Create namespace:
extends:
- .autodevops_create_namespace
environment:
name: ${CI_COMMIT_REF_SLUG}-dev2
after_script:
# Copy namespace default creds
- kubectl get secret cdtn-admin-secrets --namespace=cdtn-admin-secret --export -o yaml |
Expand All @@ -33,6 +35,13 @@ Create Azure DB (dev):

#

Stop review:
extends: .autodevops_stop_review
environment:
name: ${CI_COMMIT_REF_SLUG}-dev2

#

Install:
only:
- never
Expand All @@ -57,6 +66,8 @@ Register image:
Deploy app (dev):
only:
- never
environment:
name: ${CI_COMMIT_REF_SLUG}-dev2

Deploy app (prod):
only:
Expand Down
8 changes: 8 additions & 0 deletions targets/alert-cli/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,15 @@ Deploy alert (dev):
extends:
- .autodevops_deploy_app_dev
- .deploy_alert_stage
environment:
name: ${CI_COMMIT_REF_SLUG}-dev2

Deploy alert (prod):
extends:
- .autodevops_deploy_app_prod
- .deploy_alert_stage
environment:
name: prod2
variables:
PRODUCTION: "true"

Expand Down Expand Up @@ -104,8 +108,12 @@ Trigger alert (dev):
extends:
- .autodevops_deploy_app_dev
- .trigger_alert_cron
environment:
name: ${CI_COMMIT_REF_SLUG}-dev2

Trigger alert (prod):
extends:
- .autodevops_deploy_app_prod
- .trigger_alert_cron
environment:
name: prod2
4 changes: 4 additions & 0 deletions targets/frontend/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,16 @@ Deploy www (dev):
extends:
- .autodevops_deploy_app_dev
- .deploy_www_stage
environment:
name: ${CI_COMMIT_REF_SLUG}-dev2
variables:
MANIFEST_FOLDER: targets/frontend/.k8s/environments/dev

Deploy www (prod):
extends:
- .autodevops_deploy_app_prod
- .deploy_www_stage
environment:
name: prod2
variables:
MANIFEST_FOLDER: targets/frontend/.k8s/environments/prod
2 changes: 2 additions & 0 deletions targets/frontend/.k8s/www.values.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ deployment:
name: cdtn-admin-secrets
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
4 changes: 4 additions & 0 deletions targets/hasura/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Deploy Hasura (dev):
extends:
- .autodevops_deploy_app_dev
- .deploy_hasura
environment:
name: ${CI_COMMIT_REF_SLUG}-dev2
variables:
PG_HOST: cdtnadmindevserver.postgres.database.azure.com
HELM_RENDER_ARGS: >-
Expand All @@ -30,5 +32,7 @@ Deploy Hasura (prod):
extends:
- .autodevops_deploy_app_prod
- .deploy_hasura
environment:
name: prod2
variables:
PRODUCTION: "true"