Skip to content

Commit d12db91

Browse files
author
Fred Smith
committed
remove docker test scripts
1 parent 22d6e18 commit d12db91

File tree

4 files changed

+1
-635
lines changed

4 files changed

+1
-635
lines changed

docker.mk

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: docker.build docker.test docker.pkg
1+
.PHONY: docker.build docker.pkg
22

33
SHARD=0
44
SHARDS=1
@@ -12,7 +12,6 @@ images:=$(if $(TRAVIS_COMMIT_RANGE),$(shell git diff --name-only $(TRAVIS_COMMIT
1212
images:=$(shell echo "$(all_images) $(images)" | tr " " "\n" | sort | uniq -d)
1313

1414
docker_build=docker.build.
15-
docker_test=docker.test.
1615
docker_pkg=docker.pkg.
1716
docker_push=docker.push.
1817

@@ -26,12 +25,10 @@ docker.help:
2625
@echo ' $(docker_pull)$$image pull $$image from dockerhub'
2726
@echo ''
2827
@echo ' $(docker_build)$$container build $$container'
29-
@echo ' $(docker_test)$$container test that $$container will build'
3028
@echo ' $(docker_pkg)$$container package $$container for a push to dockerhub'
3129
@echo ' $(docker_push)$$container push $$container to dockerhub '
3230
@echo ''
3331
@echo ' docker.build build all defined docker containers (based on dockerhub base images)'
34-
@echo ' docker.test test all defined docker containers'
3532
@echo ' docker.pkg package all defined docker containers (using local base images)'
3633
@echo ' docker.push push all defined docker containers'
3734
@echo ''
@@ -44,19 +41,14 @@ docker_pull=docker.pull/
4441

4542
build: docker.build
4643

47-
test: docker.test
48-
4944
pkg: docker.pkg
5045

5146
clean: docker.clean
5247

5348
docker.clean:
5449
rm -rf .build
5550

56-
docker.test.shard: $(foreach image,$(shell echo $(images) | python util/balancecontainers.py $(SHARDS) | awk 'NR%$(SHARDS)==$(SHARD)'),$(docker_test)$(image))
57-
5851
docker.build: $(foreach image,$(images),$(docker_build)$(image))
59-
docker.test: $(foreach image,$(images),$(docker_test)$(image))
6052
docker.pkg: $(foreach image,$(images),$(docker_pkg)$(image))
6153
docker.push: $(foreach image,$(images),$(docker_push)$(image))
6254

@@ -66,9 +58,6 @@ $(docker_pull)%:
6658
$(docker_build)%: docker/build/%/Dockerfile
6759
docker build -f $< .
6860

69-
$(docker_test)%: .build/%/Dockerfile.test
70-
docker build -t $*:test -f $< .
71-
7261
$(docker_pkg)%: .build/%/Dockerfile.pkg
7362
docker build -t $*:latest -f $< .
7463

@@ -88,21 +77,13 @@ $(docker_push)%: $(docker_pkg)%
8877
@echo $(EDXOPS_FROM)
8978
@echo "$(docker_build)$*: $(docker_pull)$(FROM)" > $@
9079
@if [ "$(EDXOPS_FROM)" != "$(FROM)" ]; then \
91-
echo "$(docker_test)$*: $(docker_test)$(EDXOPS_FROM:@%=)" >> $@; \
9280
echo "$(docker_pkg)$*: $(docker_pkg)$(EDXOPS_FROM:@%=)" >> $@; \
9381
else \
94-
echo "$(docker_test)$*: $(docker_pull)$(FROM)" >> $@; \
9582
echo "$(docker_pkg)$*: $(docker_pull)$(FROM)" >> $@; \
9683
fi
9784

98-
.build/%/Dockerfile.test: docker/build/%/Dockerfile Makefile
99-
@mkdir -p .build/$*
100-
@# perl p (print the line) n (loop over every line) e (exec the regex), like sed but cross platform
101-
@perl -pne "s#FROM edxops/([^:]+)(:\S*)?#FROM \1:test#" $< > $@
102-
10385
.build/%/Dockerfile.pkg: docker/build/%/Dockerfile Makefile
10486
@mkdir -p .build/$*
10587
@# perl p (print the line) n (loop over every line) e (exec the regex), like sed but cross platform
106-
@perl -pne "s#FROM edxops/([^:]+)(:\S*)?#FROM \1:test#" $< > $@
10788

10889
-include $(foreach image,$(images),.build/$(image)/Dockerfile.d)

util/balancecontainers.py

-108
This file was deleted.

util/docker_images.py

-37
This file was deleted.

0 commit comments

Comments
 (0)