From eedfe50a993c4001665c73648e624af607e59da6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 15 Jun 2021 13:32:03 +0200 Subject: [PATCH 1/3] Jenkinsfile: update labels to prevent running on cgroups v2 The dind engine version that we use in e2e does not support cgroups v2, so if we landed on an Ubuntu 20.04 node with cgroups v2 enabled, CI failed: Stderr: Error response from daemon: cgroups: cgroup mountpoint does not exist: unknown Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 2849437f217468237d5d4196b21d31f72ce07d4b) Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d5028c921b..fd168193aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent { - label "linux && x86_64" + label "amd64 && ubuntu-1804 && overlay2" } options { From 0d17280a30822f98f978cc5231cf8dc1b525f209 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 9 Jun 2021 13:41:59 +0200 Subject: [PATCH 2/3] Jenkinsfile: update old engine version to 19.03 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 661b87ac9b5eff8f3d9fe6cd010e930453b06d92) Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fd168193aa..1e0850257b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,9 +21,9 @@ pipeline { make -f docker.Makefile test-e2e-non-experimental" } } - stage("e2e (non-experimental) - 18.09 engine") { + stage("e2e (non-experimental) - 19.03 engine") { steps { - sh "E2E_ENGINE_VERSION=18.09-dind \ + sh "E2E_ENGINE_VERSION=19.03-dind \ E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \ IMAGE_TAG=clie2e${BUILD_NUMBER} \ make -f docker.Makefile test-e2e-non-experimental" From 644c0036066115f3d67e4ce3690d09d645df3e07 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 9 Jun 2021 13:44:09 +0200 Subject: [PATCH 3/3] circleCI: update docker engine to 20.10.6 20.10.6 looks to be the latest supported version: https://circleci.com/docs/2.0/building-docker-images/#docker-version Signed-off-by: Sebastiaan van Stijn (cherry picked from commit c6cd0493ab83fa58d8d36f83188a68d317929aef) Signed-off-by: Sebastiaan van Stijn --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ca64e0d10f..fab2fb2909 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,13 +4,13 @@ jobs: lint: working_directory: /work - docker: [{image: 'docker:19.03-git'}] + docker: [{image: 'docker:20.10-git'}] environment: DOCKER_BUILDKIT: 1 steps: - checkout - setup_remote_docker: - version: 19.03.12 + version: 20.10.6 reusable: true exclusive: false - run: @@ -39,7 +39,7 @@ jobs: cross: working_directory: /work - docker: [{image: 'docker:19.03-git'}] + docker: [{image: 'docker:20.10-git'}] environment: DOCKER_BUILDKIT: 1 BUILDX_VERSION: "v0.5.1" @@ -47,7 +47,7 @@ jobs: steps: - checkout - setup_remote_docker: - version: 19.03.12 + version: 20.10.6 reusable: true exclusive: false - run: @@ -69,13 +69,13 @@ jobs: test: working_directory: /work - docker: [{image: 'docker:19.03-git'}] + docker: [{image: 'docker:20.10-git'}] environment: DOCKER_BUILDKIT: 1 steps: - checkout - setup_remote_docker: - version: 19.03.12 + version: 20.10.6 reusable: true exclusive: false - run: @@ -116,13 +116,13 @@ jobs: validate: working_directory: /work - docker: [{image: 'docker:19.03-git'}] + docker: [{image: 'docker:20.10-git'}] environment: DOCKER_BUILDKIT: 1 steps: - checkout - setup_remote_docker: - version: 19.03.12 + version: 20.10.6 reusable: true exclusive: false - run: