Skip to content

Commit

Permalink
reverting
Browse files Browse the repository at this point in the history
  • Loading branch information
George Hudson committed Oct 31, 2023
1 parent 2de4055 commit 585acc8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/base_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ parameters:
default: false
target_env:
type: string
default: 'nil'
default: ''
triggered:
type: boolean
default: false
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ parameters:
default: false
target_env:
type: string
default: 'nil'
default: ''
triggered:
type: boolean
default: false
Expand Down
11 changes: 7 additions & 4 deletions .circleci/deployment/jobs.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# jobs:
deploy-dev:
executor: docker-executor
parameters:
target_env:
type: string
working_directory: ~/tdp-deploy
steps:
- when:
condition: << pipeline.parameters.run_dev_deployment >>
steps:
- deploy-cloud-dot-gov:
backend-appname: tdp-backend-<< pipeline.parameters.target_env >>
frontend-appname: tdp-frontend-<< pipeline.parameters.target_env >>
backend-appname: tdp-backend-<< parameters.target_env >>
frontend-appname: tdp-frontend-<< parameters.target_env >>

deploy-staging:
executor: docker-executor
Expand All @@ -33,7 +36,7 @@
cf-username: CF_USERNAME_STAGING

deploy-infrastructure-dev:
parameters:
parameters:
target_env:
type: string
executor: terraform/default
Expand All @@ -43,7 +46,7 @@
condition: << pipeline.parameters.run_dev_deployment >>
steps:
- deploy-infrastructure:
cf-app: << pipeline.parameters.target_env >>
cf-app: << parameters.target_env >>

deploy-infrastructure-staging:
executor: terraform/default
Expand Down
2 changes: 2 additions & 0 deletions .circleci/deployment/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- develop
- master
- deploy-infrastructure-dev:
target_env: << pipeline.parameters.target_env >>
filters:
branches:
ignore:
Expand Down Expand Up @@ -84,6 +85,7 @@
only:
- master
- deploy-dev:
target_env: << pipeline.parameters.target_env >>
requires:
- deploy-infrastructure-dev
filters:
Expand Down

0 comments on commit 585acc8

Please sign in to comment.