Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 63d7606

Browse filesBrowse files
dnephindnephin
committed
Add a Jenkinsfile
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1 parent b5cb5ee commit 63d7606
Copy full SHA for 63d7606

4 files changed

+22-8Lines changed: 22 additions & 8 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎Jenkinsfile‎

Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
wrappedNode(label: 'linux && x86_64', cleanWorkspace: true) {
2+
timeout(time: 60, unit: 'MINUTES') {
3+
stage "Git Checkout"
4+
checkout scm
5+
6+
stage "Run end-to-end test suite"
7+
sh "docker version"
8+
sh "E2E_UNIQUE_ID=clie2e${BUILD_NUMBER} \
9+
IMAGE_TAG=clie2e${BUILD_NUMBER} \
10+
make -f docker.Makefile test-e2e"
11+
}
12+
}
Collapse file

‎docker.Makefile‎

Copy file name to clipboardExpand all lines: docker.Makefile
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# Makefile for developing using Docker
55
#
66

7-
DEV_DOCKER_IMAGE_NAME = docker-cli-dev
8-
LINTER_IMAGE_NAME = docker-cli-lint
9-
CROSS_IMAGE_NAME = docker-cli-cross
10-
VALIDATE_IMAGE_NAME = docker-cli-shell-validate
7+
DEV_DOCKER_IMAGE_NAME = docker-cli-dev$(IMAGE_TAG)
8+
LINTER_IMAGE_NAME = docker-cli-lint$(IMAGE_TAG)
9+
CROSS_IMAGE_NAME = docker-cli-cross$(IMAGE_TAG)
10+
VALIDATE_IMAGE_NAME = docker-cli-shell-validate$(IMAGE_TAG)
1111
MOUNTS = -v "$(CURDIR)":/go/src/github.com/docker/cli
1212
VERSION = $(shell cat VERSION)
1313
ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT
@@ -91,6 +91,6 @@ yamldocs: build_docker_image
9191
shellcheck: build_shell_validate_image
9292
docker run -ti --rm $(ENVVARS) $(MOUNTS) $(VALIDATE_IMAGE_NAME) make shellcheck
9393

94-
.PHONY: test-e2e:
94+
.PHONY: test-e2e
9595
test-e2e: binary
9696
./scripts/test/e2e/wrapper
Collapse file

‎dockerfiles/Dockerfile.test-e2e-env‎

Copy file name to clipboardExpand all lines: dockerfiles/Dockerfile.test-e2e-env
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ FROM docker/compose:1.15.0
22

33
RUN apk add -U bash curl
44

5-
RUN curl -Ls https://download.docker.com/linux/static/edge/x86_64/docker-17.06.0-ce.tgz | \
5+
ARG DOCKER_CHANNEL=edge
6+
ARG DOCKER_VERSION=17.06.0-ce
7+
RUN export URL=https://download.docker.com/linux/static; \
8+
curl -Ls $URL/$DOCKER_CHANNEL/x86_64/docker-$DOCKER_VERSION.tgz | \
69
tar -xz docker/docker && \
710
mv docker/docker /usr/local/bin/ && \
811
rmdir docker
@@ -12,4 +15,3 @@ COPY scripts/test/e2e scripts/test/e2e
1215
COPY e2e/compose-env.yaml e2e/compose-env.yaml
1316

1417
ENTRYPOINT ["bash", "/work/scripts/test/e2e/run"]
15-
CMD []
Collapse file

‎e2e/compose-env.yaml‎

Copy file name to clipboardExpand all lines: e2e/compose-env.yaml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.3'
1+
version: '2.1'
22

33
services:
44
registry:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.