Skip to content

Commit 9a30dc8

Browse files
cameronhargreaves1-nhscameronhargreaves1-nhs
authored
Merge pull request #1161 from NHSDigital/DTOSS-12324-remove-notifications-app
Remove all notifications code
2 parents 1a36c5e + 4a28da2 commit 9a30dc8

File tree

103 files changed

+6
-14621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+6
-14621
lines changed

‎.azuredevops/pipelines/deploy.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,3 @@ stages:
7171
scriptLocation: inlineScript
7272
addSpnToEnvironment: true
7373
inlineScript: make ci ${{ parameters.environment }} db-setup PR_NUMBER=${{ parameters.prNumber }}
74-
75-
- task: AzureCLI@2
76-
displayName: Run notifications smoke test
77-
inputs:
78-
azureSubscription: manbrs-${{ parameters.environment }}
79-
scriptType: bash
80-
scriptLocation: inlineScript
81-
addSpnToEnvironment: true
82-
inlineScript: make ci ${{ parameters.environment }} notifications-smoke-test PR_NUMBER=${{ parameters.prNumber }}

‎Makefile‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ shell:
103103
test: test-unit test-ui test-lint # Run all tests @Testing
104104

105105
test-unit: # Run unit tests @Testing
106-
uv run pytest -m 'not system' --ignore manage_breast_screening/notifications/tests/dependencies --ignore manage_breast_screening/notifications/tests/integration --ignore manage_breast_screening/notifications/tests/end_to_end --ignore scripts/python/smoke_test --cov --cov-report term-missing:skip-covered
106+
uv run pytest -m 'not system' --ignore scripts/python/smoke_test --cov --cov-report term-missing:skip-covered
107107
npm test -- --coverage
108108

109109
test-lint: # Lint files @Testing
@@ -118,13 +118,7 @@ test-lint-templates: # Lint just the templates @Testing
118118
uv run djlint -e jinja --lint --profile jinja manage_breast_screening
119119

120120
test-ui: # Run UI tests @Testing
121-
uv run pytest -m system --ignore manage_breast_screening/notifications
122-
123-
test-integration:
124-
cd manage_breast_screening/notifications && ./tests/integration/run.sh
125-
126-
test-end-to-end:
127-
cd manage_breast_screening/notifications && ./tests/end_to_end/run.sh
121+
uv run pytest -m system
128122

129123
# ---------------------------------------------------------------------------
130124
# Build & Deploy

‎infrastructure/environments/dev/variables.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ HUB_SUBSCRIPTION="Digital Screening DToS - DevOps"
55
HUB=dev
66
TERRAFORM_MODULES_REF=main
77
ENABLE_SOFT_DELETE=false
8-
ADO_MANAGEMENT_POOL=private-pool-dev-uks
9-
RUN_NOTIFICATIONS_SMOKE_TEST=true
8+
ADO_MANAGEMENT_POOL=private-pool-dev-uks

‎infrastructure/environments/dev/variables.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
api_oauth_token_url = "https://int.api.service.nhs.uk/oauth2/token"
22
dns_zone_name = "manage-breast-screening.non-live.screening.nhs.uk"
33
enable_entra_id_authentication = false
4-
enable_notifications_jobs_schedule = false
54
fetch_secrets_from_app_key_vault = true
65
front_door_profile = "afd-nonlive-hub-manbrs"
76
postgres_backup_retention_days = 7

‎infrastructure/environments/dev/variables.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ BASIC_AUTH_ENABLED: True
33
CIS2_SERVER_METADATA_URL: https://am.nhsint.auth-ptl.cis2.spineservices.nhs.uk/openam/oauth2/realms/root/realms/NHSIdentity/realms/Healthcare/.well-known/openid-configuration
44
PERSONAS_ENABLED: 1
55
CSRF_TRUSTED_ORIGINS: 'https://dev.manage-breast-screening.non-live.screening.nhs.uk'
6-
NOTIFICATIONS_SMTP_IS_ENABLED: False
76
APPLICATIONINSIGHTS_IS_ENABLED: True
87
GUNICORN_WORKER_CONNECTIONS: 50 #reduce in dev as we have small PG instance

‎infrastructure/environments/preprod/variables.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ HUB=prod
66
TERRAFORM_MODULES_REF=main
77
ENABLE_SOFT_DELETE=false
88
ADO_MANAGEMENT_POOL=private-pool-prod-uks
9-
RUN_NOTIFICATIONS_SMOKE_TEST=true

‎infrastructure/environments/preprod/variables.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ deploy_database_as_container = false
1010
vnet_address_space = "10.10.0.0/16"
1111
seed_demo_data = false
1212
enable_alerting = true
13-
enable_notifications_jobs_schedule = false
1413
min_replicas = 2
1514
container_memory = "1"

‎infrastructure/environments/preprod/variables.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ BASIC_AUTH_ENABLED: True
33
CIS2_SERVER_METADATA_URL: https://am.nhsint.auth-ptl.cis2.spineservices.nhs.uk/openam/oauth2/realms/root/realms/NHSIdentity/realms/Healthcare/.well-known/openid-configuration
44
PERSONAS_ENABLED: 1
55
CSRF_TRUSTED_ORIGINS: 'https://preprod.manage-breast-screening.nhs.uk'
6-
NOTIFICATIONS_SMTP_IS_ENABLED: True
76
APPLICATIONINSIGHTS_IS_ENABLED: True

‎infrastructure/environments/prod/variables.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ HUB=prod
66
TERRAFORM_MODULES_REF=main
77
ENABLE_SOFT_DELETE=false
88
ADO_MANAGEMENT_POOL=private-pool-prod-uks
9-
RUN_NOTIFICATIONS_SMOKE_TEST=false

‎infrastructure/environments/prod/variables.tfvars‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ vnet_address_space = "10.11.0.0/16"
1111
enable_alerting = true
1212
use_apex_domain = true
1313
cae_zone_redundancy_enabled = true
14-
enable_notifications_jobs_schedule = false
1514
min_replicas = 2
1615
container_memory = "1"

0 commit comments

Comments
 (0)