Run e2e tests with different engine version on Jenkins

Rewrite Jenkinsfile to new declarative syntax without parallel as the e2e framework is not tailored for than (container name clash, port clash,...)

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
This commit is contained in:
Silvin Lubecki 2020-05-19 19:34:42 +02:00
parent 15d6565e49
commit 74919d0569
1 changed files with 44 additions and 22 deletions

44
Jenkinsfile vendored
View File

@ -1,25 +1,47 @@
wrappedNode(label: 'linux && x86_64', cleanWorkspace: true) { pipeline {
timeout(time: 60, unit: 'MINUTES') { agent {
stage "Git Checkout" label "linux && x86_64"
checkout scm }
stage "Docker info" options {
timeout(time: 60, unit: 'MINUTES')
}
stages {
stage("Docker info") {
steps {
sh "docker version" sh "docker version"
sh "docker info" sh "docker info"
}
stage "e2e (non-experimental)" }
stage("e2e (non-experimental) - stable engine") {
steps {
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-non-experimental" DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-non-experimental"
}
stage "e2e (experimental)" }
stage("e2e (non-experimental) - 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-non-experimental"
}
}
stage("e2e (experimental)") {
steps {
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-experimental" DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-experimental"
}
stage "e2e (ssh connhelper)" }
stage("e2e (ssh connhelper)") {
steps {
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-connhelper-ssh" DOCKER_BUILDKIT=1 make -f docker.Makefile test-e2e-connhelper-ssh"
} }
}
}
} }