Merge pull request #748 from NHSDigital/export-environment-to-smoke-test

Export `ENVIRONMENT` prior to running smoke test

Author: steventux

scripts/python/smoke_test/notifications_smoke_test.py

@@ -15,7 +15,8 @@
 def test_notifications():
     logging.info("Running notifications smoke test")
 
-    environment, storage_account, resource_group_name = configure()
+    environment = os.getenv("ENVIRONMENT")
+    resource_group_name = f"rg-manbrs-{environment}-container-app-uks"
 
     if environment == "prod":
         return
@@ -38,20 +39,6 @@ def test_notifications():
     logging.info("Finished notifications smoke test")
 
 
-def configure():
-    environment = os.getenv("ENVIRONMENT", "dev")
-    pr_number = os.getenv("PR_NUMBER", "")
-    storage_account = f"stmanbrs{environment}uks"
-
-    if pr_number != "":
-        environment = f"pr-{pr_number}"
-        storage_account = f"stmanbrspr{pr_number}uks"
-
-    resource_group_name = f"rg-manbrs-{environment}-container-app-uks"
-
-    return (environment, storage_account, resource_group_name)
-
-
 def setup_mesh_inbox_test_data(environment: str, resource_group_name: str):
     populate_mesh_env_vars(environment, resource_group_name)
     mesh_client().send_message(

scripts/terraform/terraform.mk

@@ -77,6 +77,7 @@ terraform-validate: terraform-init-no-backend # Validate Terraform changes - mak
 
 notifications-smoke-test:
 	if test "${RUN_NOTIFICATIONS_SMOKE_TEST}" == "true"; then
+		export ENVIRONMENT
 		pip install pytest mesh-client
 		pytest -vv scripts/python/smoke_test/notifications_smoke_test.py
 	else