Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3137 from thaJeztah/update_ci_engine 

CI: update engine versions and Jenkins labels
This commit is contained in:
Silvin Lubecki 2021-06-15 15:28:04 +02:00 committed by GitHub
parent fa63ea7955 c6cd0493ab
commit e3ade90f5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.circleci/config.yml
View File

@ -4,13 +4,13 @@ jobs:
lint: lint:
working_directory: /work working_directory: /work
docker: [{image: 'docker:19.03-git'}] docker: [{image: 'docker:20.10-git'}]
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
steps: steps:
- checkout - checkout
- setup_remote_docker: - setup_remote_docker:
version: 19.03.12 version: 20.10.6
reusable: true reusable: true
exclusive: false exclusive: false
- run: - run:
@ -39,7 +39,7 @@ jobs:
cross: cross:
working_directory: /work working_directory: /work
docker: [{image: 'docker:19.03-git'}] docker: [{image: 'docker:20.10-git'}]
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
BUILDX_VERSION: "v0.5.1" BUILDX_VERSION: "v0.5.1"
@ -47,7 +47,7 @@ jobs:
steps: steps:
- checkout - checkout
- setup_remote_docker: - setup_remote_docker:
version: 19.03.12 version: 20.10.6
reusable: true reusable: true
exclusive: false exclusive: false
- run: - run:
@ -69,13 +69,13 @@ jobs:
test: test:
working_directory: /work working_directory: /work
docker: [{image: 'docker:19.03-git'}] docker: [{image: 'docker:20.10-git'}]
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
steps: steps:
- checkout - checkout
- setup_remote_docker: - setup_remote_docker:
version: 19.03.12 version: 20.10.6
reusable: true reusable: true
exclusive: false exclusive: false
- run: - run:
@ -116,13 +116,13 @@ jobs:
validate: validate:
working_directory: /work working_directory: /work
docker: [{image: 'docker:19.03-git'}] docker: [{image: 'docker:20.10-git'}]
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
steps: steps:
- checkout - checkout
- setup_remote_docker: - setup_remote_docker:
version: 19.03.12 version: 20.10.6
reusable: true reusable: true
exclusive: false exclusive: false
- run: - run:

6
Jenkinsfile vendored
View File

@ -1,6 +1,6 @@
pipeline { pipeline {
agent { agent {
label "linux && x86_64" label "amd64 && ubuntu-1804 && overlay2"
} }
options { options {
@ -21,9 +21,9 @@ pipeline {
make -f docker.Makefile test-e2e-non-experimental" make -f docker.Makefile test-e2e-non-experimental"
} }
} }
stage("e2e (non-experimental) - 18.09 engine") { stage("e2e (non-experimental) - 19.03 engine") {
steps { steps {
sh "E2E_ENGINE_VERSION=18.09-dind \ sh "E2E_ENGINE_VERSION=19.03-dind \
E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \ E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
IMAGE_TAG=clie2e${BUILD_NUMBER} \ IMAGE_TAG=clie2e${BUILD_NUMBER} \
make -f docker.Makefile test-e2e-non-experimental" make -f docker.Makefile test-e2e-non-experimental"