From ff2c1c08563375bdcf59cd2309370b859ebe3703 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 10 Apr 2020 12:29:46 +0200 Subject: [PATCH] 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 --- Jenkinsfile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3416d9578e..e4ea6f000c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,11 +3,23 @@ wrappedNode(label: 'linux && x86_64', cleanWorkspace: true) { stage "Git Checkout" checkout scm - stage "Run end-to-end test suite" + stage "Docker info" sh "docker version" sh "docker info" + + stage "e2e (non-experimental)" sh "E2E_UNIQUE_ID=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" } }