Merge branch 'Testing-with-8GB' of https://github.com/NHSDigital/IOPS-FHIR-Test-Scripts into IOPS-4054-Increasing-Heap-Mem-for-Maven-Build

Author: KazeemHamzat

.github/workflows/masterfhirvalidation.yml

@@ -65,12 +65,12 @@ jobs:
 
       - name: Build FHIR 
         env:
-          MAVEN_OPTS: -Xmx4G
+          MAVEN_OPTS: -Xmx8G
         run: cd validation-service-fhir-r4 && mvn clean package
 
       - name: Run FHIR Validator
         run: |
-          nohup java  -Xms2G -Xmx8G -jar validation-service-fhir-r4/target/fhir-validator.jar --terminology.url=https://ontology.nhs.uk/production1/fhir --terminology.authorization.tokenUrl=https://ontology.nhs.uk/authorisation/auth/realms/nhs-digital-terminology/protocol/openid-connect/token --terminology.authorization.clientId=${{ secrets.ONTO_CLIENT_ID }} --terminology.authorization.clientSecret=${{ secrets.ONTO_CLIENT_SECRET }} --aws.validationSupport=false --aws.queueEnabled=false &
+          nohup java -Xmx2G -jar validation-service-fhir-r4/target/fhir-validator.jar --terminology.url=https://ontology.nhs.uk/production1/fhir --terminology.authorization.tokenUrl=https://ontology.nhs.uk/authorisation/auth/realms/nhs-digital-terminology/protocol/openid-connect/token --terminology.authorization.clientId=${{ secrets.ONTO_CLIENT_ID }} --terminology.authorization.clientSecret=${{ secrets.ONTO_CLIENT_SECRET }} --aws.validationSupport=false --aws.queueEnabled=false &
           # Wait for it to become ready, try 30 times, with 10 seconds between
           for i in {1..60}; do
             if curl -sSf http://localhost:9001/metadata > /dev/null || \

src/validator.test.ts

@@ -9,8 +9,10 @@ import fs from "fs";
 // Retry: This lines address the "$validate-code" read timeoout (e.g., when the terminology endpoint is slow)
 jest.retryTimes(2, { logErrorsBeforeRetry: true });
 
-const args = require('minimist')(process.argv.slice(2))
+// Retry flaky specs (e.g., when the terminology endpoint is slow)
+jest.retryTimes(2, { logErrorsBeforeRetry: true });
 
+const args = require('minimist')(process.argv.slice(2))
 
 let terminology = true;
 jest.setTimeout(120_000)