Skip to content

Experiment: add e2e tests back into pipeline #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevenmccullaghmadetech wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Experiment: add e2e tests back into pipeline #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84e47ff
Experiment: add e2e tests back into pipeline
stevenmccullaghmadetech Aug 20, 2024
3b255b3
Cleaning up
stevenmccullaghmadetech Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)') {
Expand Down Expand Up @@ -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
Copy link
Collaborator

@MartinWheelerMT MartinWheelerMT Sep 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we parameterise the "eu-west" AWS_DEFAULT_REGION as well, rather than hard coding it?

return (r == 0);
}
}
}
}
sh label: 'Running integration tests', script: """
export SKIP_FORWARD_RELIABLE_INT_TEST=true
pipenv run inttests
"""
}
}
}
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.component-sds.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
outbound:
environment:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.component.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
route:
build:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.release.image.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:${BUILD_TAG}
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: local/mhs-inbound:${BUILD_TAG}
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/0.0.1/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:0.0.1
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/0.0.2/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:0.0.2
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/1.0.0/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:1.0.0
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/1.0.1/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:1.0.1
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/1.0.2/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:1.0.2
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/1.1.0/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:1.1.0
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/1.1.1/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:1.1.1
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/1.2.0/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:1.2.0
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/1.2.1/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:1.2.1
Expand Down
2 changes: 0 additions & 2 deletions test-scripts/1.2.2/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
inbound:
image: nhsdev/nia-mhs-inbound:1.2.2
Expand Down