From a49524b5fb53c5598098a4ccb31b8b051d52f298 Mon Sep 17 00:00:00 2001 From: Silvin Lubecki Date: Wed, 20 May 2020 14:45:56 +0200 Subject: [PATCH] Remove parallel from Jenkinsfile, as the e2e framework is not tailored for than (container name clash, port clash,...) Signed-off-by: Silvin Lubecki --- Jenkinsfile | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9e5f3e342174..835538c4b577 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,22 +15,20 @@ pipeline { } } stage("end-to-end test suite") { - parallel { - stage("stable engine") { - steps { - sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \ - IMAGE_TAG=clie2e${BUILD_NUMBER} \ - DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e" - } + stage("stable engine") { + steps { + sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \ + IMAGE_TAG=clie2e${BUILD_NUMBER} \ + DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e" + } + } + stage("18.09 engine") { + steps { + 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" } - stage("18.09 engine") { - steps { - 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" - } - } } } }