Jenkinsfile: split e2e tests to separate stages

The non-experimental, experimental, and ssh-connhelper stages
are running the same tests, which makes it difficult to find
_which_ variant of the test failed if they all run in the
same stage.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-04-10 12:29:46 +02:00
parent ad256ba023
commit ff2c1c0856
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 14 additions and 2 deletions

16
Jenkinsfile vendored
View File

@ -3,11 +3,23 @@ wrappedNode(label: 'linux && x86_64', cleanWorkspace: true) {
stage "Git Checkout" stage "Git Checkout"
checkout scm checkout scm
stage "Run end-to-end test suite" stage "Docker info"
sh "docker version" sh "docker version"
sh "docker info" sh "docker info"
stage "e2e (non-experimental)"
sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \ sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
IMAGE_TAG=clie2e${BUILD_NUMBER} \ IMAGE_TAG=clie2e${BUILD_NUMBER} \
DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e" DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-non-experimental"
stage "e2e (experimental)"
sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
IMAGE_TAG=clie2e${BUILD_NUMBER} \
DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-experimental"
stage "e2e (ssh connhelper)"
sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
IMAGE_TAG=clie2e${BUILD_NUMBER} \
DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-connhelper-ssh"
} }
} }