Skip to content
Merged

Edge #360

Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
93255ec
Merge pull request #239 from NHSDigital/master
Feb 11, 2021
3a11cb5
Merge pull request #248 from NHSDigital/master
matt-mercer Feb 17, 2021
d0f39b9
apm-1865: terraform upgrade
matt-mercer Feb 17, 2021
9e61318
Merge pull request #251 from NHSDigital/mm-apm-1865-terraform-13-upgr…
matt-mercer Feb 19, 2021
db6799d
Merge pull request #255 from NHSDigital/master
matt-mercer Feb 20, 2021
3531a9f
Merge pull request #257 from NHSDigital/master
matt-mercer Feb 20, 2021
9a1e50c
Merge pull request #258 from NHSDigital/master
matt-mercer Feb 20, 2021
ee4fc9f
Merge pull request #265 from NHSDigital/master
JalfResi Feb 26, 2021
ada4b73
Merge pull request #267 from NHSDigital/master
strutt Mar 2, 2021
c0e1f77
Merge pull request #269 from NHSDigital/master
Mar 2, 2021
616cd2a
Merge pull request #271 from NHSDigital/AMB-527-Fix-prod-url
JalfResi Mar 3, 2021
343d61e
Merge pull request #272 from NHSDigital/AMB-527-RFC-30025111-Merge-fi…
JalfResi Mar 3, 2021
b981b0c
Merge pull request #274 from NHSDigital/master
Mar 5, 2021
2cb76fa
Merge pull request #277 from NHSDigital/master
strutt Mar 10, 2021
940fae0
Merge pull request #280 from NHSDigital/master
jslb Mar 17, 2021
eb12670
Merge pull request #283 from NHSDigital/master
matt-mercer Mar 22, 2021
f47987b
Merge pull request #285 from NHSDigital/master
Mar 22, 2021
c62426e
Merge pull request #289 from NHSDigital/master
acarriedev Mar 24, 2021
07d9c4d
Merge pull request #293 from NHSDigital/master
matt-mercer Mar 30, 2021
4564b81
Merge pull request #295 from NHSDigital/master
acarriedev Mar 31, 2021
f73aac4
Switch back to correct build context after pre_template steps have co…
ri-ch Apr 1, 2021
f5c7883
Merge pull request #296 from NHSDigital/AEA-000
Apr 1, 2021
e449389
Merge pull request #306 from NHSDigital/master
acarriedev Apr 15, 2021
6b67ab8
Merge pull request #308 from NHSDigital/master
acarriedev Apr 16, 2021
6211f45
Merge pull request #312 from NHSDigital/master
HenryIwanejko May 20, 2021
827ede8
Merge pull request #315 from NHSDigital/master
HenryIwanejko May 25, 2021
a1200e1
Merge pull request #317 from NHSDigital/master
acarriedev May 27, 2021
a9ea83a
Merge pull request #323 from NHSDigital/master
acarriedev Jun 7, 2021
16c8bdb
Merge pull request #327 from NHSDigital/master
HenryIwanejko Jun 8, 2021
9455bbd
Merge pull request #333 from NHSDigital/master
Jul 8, 2021
fef02c3
Merge pull request #335 from NHSDigital/master
JalfResi Jul 12, 2021
332da9a
Merge pull request #341 from NHSDigital/master
acarriedev Jul 26, 2021
b05c0d7
Merge pull request #357 from NHSDigital/master
JalfResi Aug 12, 2021
8d36bd1
Merge pull request #359 from NHSDigital/master
Sep 7, 2021
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
8 changes: 8 additions & 0 deletions azure/templates/deploy-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ steps:
- ${{ each pre_template_step in parameters.pre_template }}:
- ${{ pre_template_step }}

# pre_template steps might have been doing cross account stuff
# make sure we bring everything back to the correct AWS role here
- template: ../components/aws-assume-role.yml
parameters:
role: "auto-ops"
profile: "apm_${{ parameters.aws_account }}"
aws_account: "${{ parameters.aws_account }}"

- ${{ if parameters.jinja_templates }}:
- bash: mkdir -p group_vars/all && touch jinja_templates.yml
workingDirectory: "$(UTILS_DIR)/ansible/"
Expand Down