Skip to content

Commit f49814a

Browse files
bencegadanyi1-nhsbencegadanyi1-nhs
committed
chore: addresses review & comments out non-dev envs for test
1 parent 28fa7d2 commit f49814a

File tree

2 files changed

+106
-93
lines changed

2 files changed

+106
-93
lines changed

‎.github/workflows/release.yml‎

Lines changed: 103 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,12 @@ jobs:
126126
VERSION_NUMBER: ${{ needs.tag_release.outputs.version_tag }}
127127
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
128128

129-
approve_qa_deployment:
130-
needs: [tag_release]
131-
runs-on: ubuntu-22.04
132-
environment: qa-approval
133-
steps:
134-
- name: Manual approval for QA deployment
135-
run: echo "QA deployment approved"
136-
137-
release_qa:
138-
needs: [get_commit_id, tag_release, package_code, approve_qa_deployment]
129+
release_dev:
130+
needs: [get_commit_id, tag_release, package_code]
139131
uses: ./.github/workflows/release_all_stacks.yml
140132
with:
141133
STACK_NAME: epsam
142-
TARGET_ENVIRONMENT: qa
134+
TARGET_ENVIRONMENT: dev
143135
VERSION_NUMBER: ${{ inputs.dev_version || needs.tag_release.outputs.version_tag }}
144136
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
145137
CDK_APP_NAME: EpsAssistMeApp
@@ -152,8 +144,8 @@ jobs:
152144
CREATE_INT_RC_RELEASE_NOTES: false
153145
IS_PULL_REQUEST: false
154146
secrets:
155-
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.QA_CLOUD_FORMATION_DEPLOY_ROLE }}
156-
CDK_PULL_IMAGE_ROLE: ${{ secrets.QA_CDK_PULL_IMAGE_ROLE }}
147+
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
148+
CDK_PULL_IMAGE_ROLE: ${{ secrets.DEV_CDK_PULL_IMAGE_ROLE }}
157149
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
158150
INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
159151
PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
@@ -162,83 +154,104 @@ jobs:
162154
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
163155
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
164156

165-
approve_production_deployment:
166-
needs: [release_qa]
167-
runs-on: ubuntu-22.04
168-
environment: production-approval
169-
steps:
170-
- name: Manual approval for INT and PROD deployment
171-
run: echo "Production environments (INT and PROD) deployment approved"
157+
# TODO: commented out for testing - uncomment after DEV deployment confirmed working
158+
# release_qa:
159+
# needs: [get_commit_id, tag_release, package_code, release_dev]
160+
# uses: ./.github/workflows/release_all_stacks.yml
161+
# with:
162+
# STACK_NAME: epsam
163+
# TARGET_ENVIRONMENT: qa
164+
# VERSION_NUMBER: ${{ inputs.dev_version || needs.tag_release.outputs.version_tag }}
165+
# COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
166+
# CDK_APP_NAME: EpsAssistMeApp
167+
# DEPLOY_CODE: true
168+
# LOG_RETENTION_IN_DAYS: 30
169+
# LOG_LEVEL: "DEBUG"
170+
# CREATE_INT_RELEASE_NOTES: false
171+
# CREATE_PROD_RELEASE_NOTES: false
172+
# MARK_JIRA_RELEASED: false
173+
# CREATE_INT_RC_RELEASE_NOTES: false
174+
# IS_PULL_REQUEST: false
175+
# secrets:
176+
# CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.QA_CLOUD_FORMATION_DEPLOY_ROLE }}
177+
# CDK_PULL_IMAGE_ROLE: ${{ secrets.QA_CDK_PULL_IMAGE_ROLE }}
178+
# DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
179+
# INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
180+
# PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
181+
# DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
182+
# REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
183+
# SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
184+
# SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
172185

173-
release_int:
174-
needs:
175-
[get_commit_id, tag_release, package_code, approve_production_deployment]
176-
uses: ./.github/workflows/release_all_stacks.yml
177-
with:
178-
STACK_NAME: epsam
179-
TARGET_ENVIRONMENT: int
180-
VERSION_NUMBER: ${{ inputs.dev_version || needs.tag_release.outputs.version_tag }}
181-
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
182-
CDK_APP_NAME: EpsAssistMeApp
183-
DEPLOY_CODE: true
184-
LOG_RETENTION_IN_DAYS: 30
185-
LOG_LEVEL: "INFO"
186-
CREATE_INT_RELEASE_NOTES: true
187-
CREATE_PROD_RELEASE_NOTES: false
188-
MARK_JIRA_RELEASED: false
189-
CREATE_INT_RC_RELEASE_NOTES: true
190-
IS_PULL_REQUEST: false
191-
secrets:
192-
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.INT_CLOUD_FORMATION_DEPLOY_ROLE }}
193-
CDK_PULL_IMAGE_ROLE: ${{ secrets.INT_CDK_PULL_IMAGE_ROLE }}
194-
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
195-
INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
196-
PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
197-
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
198-
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
199-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
200-
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
186+
# Commented out for safe testing - uncomment after DEV deployment confirmed working
187+
# release_int:
188+
# needs: [get_commit_id, tag_release, package_code, release_qa]
189+
# uses: ./.github/workflows/release_all_stacks.yml
190+
# with:
191+
# STACK_NAME: epsam
192+
# TARGET_ENVIRONMENT: int
193+
# VERSION_NUMBER: ${{ inputs.dev_version || needs.tag_release.outputs.version_tag }}
194+
# COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
195+
# CDK_APP_NAME: EpsAssistMeApp
196+
# DEPLOY_CODE: true
197+
# LOG_RETENTION_IN_DAYS: 731
198+
# LOG_LEVEL: "INFO"
199+
# CREATE_INT_RELEASE_NOTES: true
200+
# CREATE_PROD_RELEASE_NOTES: false
201+
# MARK_JIRA_RELEASED: false
202+
# CREATE_INT_RC_RELEASE_NOTES: true
203+
# IS_PULL_REQUEST: false
204+
# secrets:
205+
# CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.INT_CLOUD_FORMATION_DEPLOY_ROLE }}
206+
# CDK_PULL_IMAGE_ROLE: ${{ secrets.INT_CDK_PULL_IMAGE_ROLE }}
207+
# DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
208+
# INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
209+
# PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
210+
# DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
211+
# REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
212+
# SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
213+
# SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
201214

202-
release_prod:
203-
needs:
204-
[get_commit_id, tag_release, package_code, approve_production_deployment]
205-
uses: ./.github/workflows/release_all_stacks.yml
206-
with:
207-
STACK_NAME: epsam
208-
TARGET_ENVIRONMENT: prod
209-
VERSION_NUMBER: ${{ inputs.dev_version || needs.tag_release.outputs.version_tag }}
210-
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
211-
CDK_APP_NAME: EpsAssistMeApp
212-
DEPLOY_CODE: true
213-
LOG_RETENTION_IN_DAYS: 731
214-
LOG_LEVEL: "INFO"
215-
CREATE_INT_RELEASE_NOTES: false
216-
CREATE_PROD_RELEASE_NOTES: true
217-
MARK_JIRA_RELEASED: true
218-
CREATE_INT_RC_RELEASE_NOTES: false
219-
IS_PULL_REQUEST: false
220-
secrets:
221-
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_DEPLOY_ROLE }}
222-
CDK_PULL_IMAGE_ROLE: ${{ secrets.PROD_CDK_PULL_IMAGE_ROLE }}
223-
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
224-
INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
225-
PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
226-
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
227-
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
228-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
229-
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
215+
# Commented out for safe testing - uncomment after DEV deployment confirmed working
216+
# release_prod:
217+
# needs: [get_commit_id, tag_release, package_code, release_int]
218+
# uses: ./.github/workflows/release_all_stacks.yml
219+
# with:
220+
# STACK_NAME: epsam
221+
# TARGET_ENVIRONMENT: prod
222+
# VERSION_NUMBER: ${{ inputs.dev_version || needs.tag_release.outputs.version_tag }}
223+
# COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
224+
# CDK_APP_NAME: EpsAssistMeApp
225+
# DEPLOY_CODE: true
226+
# LOG_RETENTION_IN_DAYS: 731
227+
# LOG_LEVEL: "INFO"
228+
# CREATE_INT_RELEASE_NOTES: false
229+
# CREATE_PROD_RELEASE_NOTES: true
230+
# MARK_JIRA_RELEASED: true
231+
# CREATE_INT_RC_RELEASE_NOTES: false
232+
# IS_PULL_REQUEST: false
233+
# secrets:
234+
# CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_DEPLOY_ROLE }}
235+
# CDK_PULL_IMAGE_ROLE: ${{ secrets.PROD_CDK_PULL_IMAGE_ROLE }}
236+
# DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
237+
# INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
238+
# PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
239+
# DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
240+
# REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
241+
# SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
242+
# SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
230243

231-
create_release_notes:
232-
needs: [tag_release, package_code, get_commit_id, release_int, release_prod]
233-
uses: ./.github/workflows/create_release_notes.yml
234-
with:
235-
VERSION_NUMBER: ${{ inputs.dev_version || needs.tag_release.outputs.version_tag }}
236-
CREATE_INT_RELEASE_NOTES: true
237-
CREATE_INT_RC_RELEASE_NOTES: false
238-
CREATE_PROD_RELEASE_NOTES: true
239-
MARK_JIRA_RELEASED: true
240-
secrets:
241-
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
242-
DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
243-
INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
244-
PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
244+
# create_release_notes:
245+
# needs: [tag_release, package_code, get_commit_id, release_int, release_prod]
246+
# uses: ./.github/workflows/create_release_notes.yml
247+
# with:
248+
# VERSION_NUMBER: ${{ inputs.dev_version || needs.tag_release.outputs.version_tag }}
249+
# CREATE_INT_RELEASE_NOTES: true
250+
# CREATE_INT_RC_RELEASE_NOTES: false
251+
# CREATE_PROD_RELEASE_NOTES: true
252+
# MARK_JIRA_RELEASED: true
253+
# secrets:
254+
# DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
255+
# DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
256+
# INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
257+
# PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}

‎.github/workflows/release_all_stacks.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
8181
- name: create_int_rc_release_notes
8282
uses: ./.github/actions/update_confluence_jira
83-
if: ${{ inputs.CREATE_INT_RC_RELEASE_NOTES == true }}
83+
if: ${{ inputs.CREATE_INT_RC_RELEASE_NOTES == true && inputs.TARGET_ENVIRONMENT == 'int' }}
8484
with:
8585
TARGET_ENVIRONMENT: int
8686
RELEASE_TAG: ${{ inputs.VERSION_NUMBER }}
@@ -179,7 +179,7 @@ jobs:
179179

180180
- name: create_int_release_notes
181181
uses: ./.github/actions/update_confluence_jira
182-
if: ${{ inputs.CREATE_INT_RELEASE_NOTES == true && always() && !failure() && !cancelled() }}
182+
if: ${{ inputs.CREATE_INT_RELEASE_NOTES == true && inputs.TARGET_ENVIRONMENT == 'int' && always() && !failure() && !cancelled() }}
183183
with:
184184
TARGET_ENVIRONMENT: int
185185
CONFLUENCE_PAGE_ID: "899319595"
@@ -190,7 +190,7 @@ jobs:
190190

191191
- name: create_prod_release_notes
192192
uses: ./.github/actions/update_confluence_jira
193-
if: ${{ inputs.CREATE_PROD_RELEASE_NOTES == true && always() && !failure() && !cancelled() }}
193+
if: ${{ inputs.CREATE_PROD_RELEASE_NOTES == true && inputs.TARGET_ENVIRONMENT == 'prod' && always() && !failure() && !cancelled() }}
194194
with:
195195
TARGET_ENVIRONMENT: prod
196196
CONFLUENCE_PAGE_ID: "899319597"

0 commit comments

Comments
 (0)