APM-6136 modify pipeline test commands

Author: sophieclayton12-nhs

azure/templates/e2e.yml

@@ -21,9 +21,10 @@ steps:
     - bash: |
         export RELEASE_RELEASEID=$(Build.BuildId)
         export SOURCE_COMMIT_ID=$(Build.SourceVersion)
+        export PROXY_NAME="$(FULLY_QUALIFIED_SERVICE_NAME)"
+        export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
         export APIGEE_ENVIRONMENT="$(APIGEE_ENVIRONMENT)"
-        export SERVICE_BASE_PATH="$(SERVICE_BASE_PATH)"
-        export STATUS_ENDPOINT_API_KEY="$(status-endpoint-api-key)"
+        export APIGEE_ORGANIZATION="nhsd-$(APIGEE_ORGANIZATION)"
         make -C e2e ${{ parameters.test_type }}
 
       workingDirectory: $(SERVICE_DIR)

e2e/Makefile

@@ -17,21 +17,24 @@ guard-%:
 		exit 1; \
 	fi
 
-TEST_CMD := pytest -v \
+TEST_CMD := pytest \
 		--color=yes \
 		--api-name=sync-wrap \
 		--proxy-name=$(PROXY_NAME) \
-		-s
+
+ifdef APIGEE_ORGANIZATION
+  TEST_CMD += --apigee-organization=$(APIGEE_ORGANIZATION)
+endif
 
 test:
-	$(activate) $(TEST_CMD)
+	$(activate) $(TEST_CMD) -vs
+
+e2e:
+	rm -f ../reports/e2e.xml  > /dev/null || true
+	$(activate) coverage run --source ./ --module $(TEST_CMD) -rxs -v --junit-xml=../reports/e2e.xml --ignore .venv || true
+	@if [[ ! -f ../reports/e2e.xml ]]; then echo report not created; exit 1; fi
 
-#e2e:
-#	rm -f ../reports/e2e.xml  > /dev/null || true
-#	$(activate) coverage run --source ./ --module pytest -rxs -v --junit-xml=../reports/e2e.xml --ignore .venv || true
-#	@if [[ ! -f ../reports/e2e.xml ]]; then echo report not created; exit 1; fi
-#
-#smoketest:
-#	rm -f ../reports/smoketest.xml  > /dev/null || true
-#	$(activate) coverage run --source ./ --module pytest -m smoketest -rxs -v --junit-xml=../reports/smoketest.xml --ignore .venv || true
-#	@if [[ ! -f ../reports/smoketest.xml ]]; then echo report not created; exit 1; fi
+smoketest:
+	rm -f ../reports/smoketest.xml  > /dev/null || true
+	$(activate) coverage run --source ./ --module $(TEST_CMD) -m smoketest -rxs -v --junit-xml=../reports/smoketest.xml --ignore .venv || true
+	@if [[ ! -f ../reports/smoketest.xml ]]; then echo report not created; exit 1; fi