Skip to content

Commit e7fbe8e

Browse files
committed
hack: remove integration-cli-on-swarm
integration-on-swarm had unnecessary complexity and was too hard to maintain. Also, it didn't support the new non-CLI integration test suite. I'm now doing some experiments out of the repo using Kubernetes: https://github.com/AkihiroSuda/kube-moby-integration Signed-off-by: Akihiro Suda <[email protected]>
1 parent 8d76028 commit e7fbe8e

File tree

24 files changed

+1
-1496
lines changed

24 files changed

+1
-1496
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ bundles
33
vendor/pkg
44
.go-pkg-cache
55
.git
6-
hack/integration-cli-on-swarm/integration-cli-on-swarm
76

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ daemon/graphdriver/overlay2/** @dmcgowan
1212
daemon/graphdriver/windows/** @johnstep @jhowardmsft
1313
daemon/logger/awslogs/** @samuelkarp
1414
hack/** @tianon
15-
hack/integration-cli-on-swarm/** @AkihiroSuda
1615
plugin/** @cpuguy83
1716
project/** @thaJeztah

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@ contrib/builder/rpm/*/changelog
1919
dockerversion/version_autogen.go
2020
dockerversion/version_autogen_unix.go
2121
vendor/pkg/
22-
hack/integration-cli-on-swarm/integration-cli-on-swarm
2322
coverage.txt
2423
profile.out

Makefile

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ export BUILD_APT_MIRROR
105105

106106
SWAGGER_DOCS_PORT ?= 9000
107107

108-
INTEGRATION_CLI_MASTER_IMAGE := $(if $(INTEGRATION_CLI_MASTER_IMAGE), $(INTEGRATION_CLI_MASTER_IMAGE), integration-cli-master)
109-
INTEGRATION_CLI_WORKER_IMAGE := $(if $(INTEGRATION_CLI_WORKER_IMAGE), $(INTEGRATION_CLI_WORKER_IMAGE), integration-cli-worker)
110-
111108
define \n
112109

113110

@@ -212,18 +209,3 @@ swagger-docs: ## preview the API documentation
212209
-e 'REDOC_OPTIONS=hide-hostname="true" lazy-rendering' \
213210
-p $(SWAGGER_DOCS_PORT):80 \
214211
bfirsh/redoc:1.6.2
215-
216-
build-integration-cli-on-swarm: build ## build images and binary for running integration-cli on Swarm in parallel
217-
@echo "Building hack/integration-cli-on-swarm (if build fails, please refer to hack/integration-cli-on-swarm/README.md)"
218-
go build -buildmode=pie -o ./hack/integration-cli-on-swarm/integration-cli-on-swarm ./hack/integration-cli-on-swarm/host
219-
@echo "Building $(INTEGRATION_CLI_MASTER_IMAGE)"
220-
docker build -t $(INTEGRATION_CLI_MASTER_IMAGE) hack/integration-cli-on-swarm/agent
221-
@echo "Building $(INTEGRATION_CLI_WORKER_IMAGE) from $(DOCKER_IMAGE)"
222-
$(eval tmp := integration-cli-worker-tmp)
223-
# We mount pkgcache, but not bundle (bundle needs to be baked into the image)
224-
# For avoiding bakings DOCKER_GRAPHDRIVER and so on to image, we cannot use $(DOCKER_ENVS) here
225-
docker run -t -d --name $(tmp) -e DOCKER_GITCOMMIT -e BUILDFLAGS --privileged $(DOCKER_IMAGE) top
226-
docker exec $(tmp) hack/make.sh build-integration-test-binary dynbinary
227-
docker exec $(tmp) go build -buildmode=pie -o /worker github.com/docker/docker/hack/integration-cli-on-swarm/agent/worker
228-
docker commit -c 'ENTRYPOINT ["/worker"]' $(tmp) $(INTEGRATION_CLI_WORKER_IMAGE)
229-
docker rm -f $(tmp)

hack/integration-cli-on-swarm/README.md

Lines changed: 0 additions & 68 deletions
This file was deleted.

hack/integration-cli-on-swarm/agent/Dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

hack/integration-cli-on-swarm/agent/master/call.go

Lines changed: 0 additions & 132 deletions
This file was deleted.

hack/integration-cli-on-swarm/agent/master/master.go

Lines changed: 0 additions & 65 deletions
This file was deleted.

hack/integration-cli-on-swarm/agent/master/set.go

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)