Skip to content

Commit 716284b

Browse files
committed
Initial refactor for PR pipeline
1 parent dbebe5c commit 716284b

File tree

7 files changed

+118
-261
lines changed

7 files changed

+118
-261
lines changed

.github/workflows/deploy-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
type: boolean
3333
default: true
3434
environment:
35-
type: string
35+
type: choice
3636
description: Select the backend environment
3737
options:
3838
- dev
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: PR Deploy and Test
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
7+
jobs:
8+
deploy-pr-env:
9+
uses: ./.github/workflows/deploy-backend.yml
10+
with:
11+
apigee_environment: internal-dev
12+
create_mns_subscription: true
13+
environment: dev
14+
sub_environment: pr-${{github.event.pull_request.number}}

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,13 @@ build-proxy:
3737

3838
#Files to loop over in release
3939
# VED-811: remove everything except for proxy related files as we move to Github Actions for backend deployment
40-
_dist_include="poetry.toml Makefile build/. specification sandbox terraform scripts"
40+
_dist_include="poetry.toml Makefile build/. specification sandbox scripts e2e"
4141

4242
#Create /dist/ sub-directory and copy files into directory
4343
#Ensure full dir structure is preserved for Lambdas
4444
release: clean publish build-proxy
4545
mkdir -p dist
4646
for f in $(_dist_include); do cp -r $$f dist; done
47-
for f in $(PYTHON_PROJECT_DIRS); do cp --parents -r $$f dist; done
4847
cp ecs-proxies-deploy.yml dist/ecs-deploy-sandbox.yml
4948
cp ecs-proxies-deploy.yml dist/ecs-deploy-internal-qa-sandbox.yml
5049
cp ecs-proxies-deploy.yml dist/ecs-deploy-internal-dev-sandbox.yml

azure/azure-pr-pipeline.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,9 @@ extends:
3636
- environment: internal-dev
3737
jinja_templates:
3838
DOMAIN_ENDPOINT: https://pr-${{ variables.pr_number }}.imms.dev.vds.platform.nhs.uk
39-
post_deploy:
40-
- template: ./templates/post-deploy.yml
41-
parameters:
42-
aws_account_type: "dev"
4339
- environment: internal-dev-sandbox
4440
proxy_path: sandbox
4541
jinja_templates:
4642
DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
4743
post_deploy:
48-
- template: ./templates/post-deploy.yml
49-
parameters:
50-
aws_account_type: "dev"
51-
subscribe_to_mns: false
44+
- template: ./templates/sandbox-post-deploy.yml

azure/azure-release-pipeline.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,41 +34,21 @@ extends:
3434
- environment: internal-dev
3535
jinja_templates:
3636
DOMAIN_ENDPOINT: https://internal-dev.imms.dev.vds.platform.nhs.uk
37-
post_deploy:
38-
- template: ./templates/post-deploy.yml
39-
parameters:
40-
aws_account_type: "dev"
4137
- environment: internal-dev-sandbox
4238
proxy_path: sandbox
4339
jinja_templates:
4440
DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
4541
post_deploy:
46-
- template: ./templates/post-deploy.yml
47-
parameters:
48-
aws_account_type: "dev"
49-
subscribe_to_mns: false
42+
- template: ./templates/sandbox-post-deploy.yml
5043
- environment: sandbox
5144
proxy_path: sandbox
5245
jinja_templates:
5346
DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
5447
depends_on:
5548
- internal_dev_sandbox
5649
- environment: ref
57-
depends_on:
58-
- internal_dev
59-
- internal_dev_sandbox
6050
jinja_templates:
61-
DOMAIN_ENDPOINT: https://ref.imms.dev.vds.platform.nhs.uk
62-
post_deploy:
63-
- template: ./templates/post-deploy.yml
64-
parameters:
65-
aws_account_type: "dev"
51+
DOMAIN_ENDPOINT: https://ref.imms.dev.vds.platform.nhs.uk
6652
- environment: int
67-
depends_on:
68-
- internal_dev
6953
jinja_templates:
7054
DOMAIN_ENDPOINT: https://int.imms.dev.vds.platform.nhs.uk
71-
post_deploy:
72-
- template: ./templates/post-deploy.yml
73-
parameters:
74-
aws_account_type: "dev"

azure/templates/post-deploy.yml

Lines changed: 0 additions & 228 deletions
This file was deleted.

0 commit comments

Comments
 (0)