diff --git a/Jenkinsfile b/Jenkinsfile index 3416d9578e43..ff1f19f77bbf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,11 +3,22 @@ wrappedNode(label: 'linux && x86_64', cleanWorkspace: true) { stage "Git Checkout" checkout scm - stage "Run end-to-end test suite" - sh "docker version" - sh "docker info" - sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \ - IMAGE_TAG=clie2e${BUILD_NUMBER} \ - DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e" + stage("Run end-to-end test suite") { + sh "docker version" + sh "docker info" + parallel ( + "Stable engine" : { + sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \ + IMAGE_TAG=clie2e${BUILD_NUMBER} \ + DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e" + }, + "18.09" : { + sh "E2E_ENGINE_VERSION=18.09-dind \ + E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \ + IMAGE_TAG=clie2e${BUILD_NUMBER} \ + DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e" + } + ) + } } }