diff --git a/Jenkinsfile b/Jenkinsfile index 2d228d111..16310a343 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -342,6 +342,30 @@ pipeline { } } } + stage('Integration Tests (SpineRouteLookup)') { + steps { + dir('integration-tests/integration_tests') { + sh label: 'Installing integration test dependencies', script: 'pipenv install --dev --deploy --ignore-pipfile' + // Wait for MHS load balancers to have healthy targets + dir('../../pipeline/scripts/check-target-group-health') { + sh script: 'pipenv install' + // Timeout 13 minutes. + timeout(13) { + waitUntil { + script { + def r = sh script: 'sleep 10; AWS_DEFAULT_REGION=eu-west-2 pipenv run main ${MHS_OUTBOUND_TARGET_GROUP} ${MHS_INBOUND_TARGET_GROUP} ${MHS_ROUTE_TARGET_GROUP}', returnStatus: true + return (r == 0); + } + } + } + } + sh label: 'Running integration tests', script: """ + export SKIP_FORWARD_RELIABLE_INT_TEST=true + pipenv run inttests + """ + } + } + } } } stage('Run Integration Tests (SDS API)') { @@ -443,6 +467,32 @@ pipeline { } } } + + stage('Integration Tests (SDS API)') { + steps { + dir('integration-tests/integration_tests') { + sh label: 'Installing integration test dependencies', script: 'pipenv install --dev --deploy --ignore-pipfile' + + // Wait for MHS load balancers to have healthy targets + dir('../../pipeline/scripts/check-target-group-health') { + sh script: 'pipenv install' + + timeout(13) { + waitUntil { + script { + def r = sh script: 'sleep 10; AWS_DEFAULT_REGION=eu-west-2 pipenv run main ${MHS_OUTBOUND_TARGET_GROUP} ${MHS_INBOUND_TARGET_GROUP} ${MHS_ROUTE_TARGET_GROUP}', returnStatus: true + return (r == 0); + } + } + } + } + sh label: 'Running integration tests', script: """ + export SKIP_FORWARD_RELIABLE_INT_TEST=true + pipenv run inttests + """ + } + } + } } } } diff --git a/docker-compose.component-sds.override.yml b/docker-compose.component-sds.override.yml index c7df36281..e769542b6 100644 --- a/docker-compose.component-sds.override.yml +++ b/docker-compose.component-sds.override.yml @@ -1,5 +1,3 @@ -version: '3' - services: outbound: environment: diff --git a/docker-compose.component.override.yml b/docker-compose.component.override.yml index a3c7e21bd..a66607126 100644 --- a/docker-compose.component.override.yml +++ b/docker-compose.component.override.yml @@ -1,5 +1,3 @@ -version: '3' - services: route: build: diff --git a/docker-compose.release.image.override.yml b/docker-compose.release.image.override.yml index 4d58c5ade..1fda33440 100644 --- a/docker-compose.release.image.override.yml +++ b/docker-compose.release.image.override.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:${BUILD_TAG} diff --git a/docker-compose.yml b/docker-compose.yml index 7cd88cd5a..3a2e60ad0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: local/mhs-inbound:${BUILD_TAG} diff --git a/test-scripts/0.0.1/docker-compose.yml b/test-scripts/0.0.1/docker-compose.yml index f66c7da5d..f1ae5e747 100644 --- a/test-scripts/0.0.1/docker-compose.yml +++ b/test-scripts/0.0.1/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:0.0.1 diff --git a/test-scripts/0.0.2/docker-compose.yml b/test-scripts/0.0.2/docker-compose.yml index 1ade0e172..2533c9a9a 100644 --- a/test-scripts/0.0.2/docker-compose.yml +++ b/test-scripts/0.0.2/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:0.0.2 diff --git a/test-scripts/1.0.0/docker-compose.yml b/test-scripts/1.0.0/docker-compose.yml index 7df728133..45db93048 100644 --- a/test-scripts/1.0.0/docker-compose.yml +++ b/test-scripts/1.0.0/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:1.0.0 diff --git a/test-scripts/1.0.1/docker-compose.yml b/test-scripts/1.0.1/docker-compose.yml index 8caf32d00..d8da9bdd2 100644 --- a/test-scripts/1.0.1/docker-compose.yml +++ b/test-scripts/1.0.1/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:1.0.1 diff --git a/test-scripts/1.0.2/docker-compose.yml b/test-scripts/1.0.2/docker-compose.yml index 13c70d768..71ce16d71 100644 --- a/test-scripts/1.0.2/docker-compose.yml +++ b/test-scripts/1.0.2/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:1.0.2 diff --git a/test-scripts/1.1.0/docker-compose.yml b/test-scripts/1.1.0/docker-compose.yml index 8b7fd6feb..b51b25531 100644 --- a/test-scripts/1.1.0/docker-compose.yml +++ b/test-scripts/1.1.0/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:1.1.0 diff --git a/test-scripts/1.1.1/docker-compose.yml b/test-scripts/1.1.1/docker-compose.yml index d7c106a53..312dc00af 100644 --- a/test-scripts/1.1.1/docker-compose.yml +++ b/test-scripts/1.1.1/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:1.1.1 diff --git a/test-scripts/1.2.0/docker-compose.yml b/test-scripts/1.2.0/docker-compose.yml index e2e9a8ea6..0425c65c7 100644 --- a/test-scripts/1.2.0/docker-compose.yml +++ b/test-scripts/1.2.0/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:1.2.0 diff --git a/test-scripts/1.2.1/docker-compose.yml b/test-scripts/1.2.1/docker-compose.yml index 8951a4d05..09c5070b4 100644 --- a/test-scripts/1.2.1/docker-compose.yml +++ b/test-scripts/1.2.1/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:1.2.1 diff --git a/test-scripts/1.2.2/docker-compose.yml b/test-scripts/1.2.2/docker-compose.yml index e7c12bac4..d9d1958e6 100644 --- a/test-scripts/1.2.2/docker-compose.yml +++ b/test-scripts/1.2.2/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: inbound: image: nhsdev/nia-mhs-inbound:1.2.2