Skip to content
This repository has been archived by the owner on May 6, 2024. It is now read-only.

Commit

Permalink
Include go-server in config file for Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
isabelgk committed Jun 15, 2018
1 parent 1253cfe commit a856a43
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dockerfiles:=$(shell ls docker/build/*/Dockerfile)
all_images:=$(patsubst docker/build/%/Dockerfile,%,$(dockerfiles))

# Used in the test.mk file as well.
images:= go-server
images:=$(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py)

docker_build=docker.build.
docker_test=docker.test.
Expand Down Expand Up @@ -51,7 +51,7 @@ clean: docker.clean
docker.clean:
rm -rf .build

docker.test.shard: $(foreach image,$(shell echo $(images) | tr ' ' '\n' | awk 'NR%$(SHARDS)==$(SHARD)'),$(docker_test)$(image))
docker.test.shard: $(foreach image,$(shell echo $(images) | python util/balancecontainers.py $(SHARDS) | awk 'NR%$(SHARDS)==$(SHARD)'),$(docker_test)$(image))

docker.build: $(foreach image,$(images),$(docker_build)$(image))
docker.test: $(foreach image,$(images),$(docker_test)$(image))
Expand All @@ -65,9 +65,7 @@ $(docker_build)%: docker/build/%/Dockerfile
docker build -f $< .

$(docker_test)%: .build/%/Dockerfile.test
date
docker build -t $*:test -f $< .
date

$(docker_pkg)%: .build/%/Dockerfile.pkg
docker build -t $*:latest -f $< .
Expand Down
2 changes: 1 addition & 1 deletion util/parsefiles_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ docker_plays_paths:
weights:
- discovery: 6
- go-agent: 3
- go-server: 5
- go-agent-marketing: 4
- xqwatcher: 3
- analytics_api: 1
Expand Down Expand Up @@ -38,4 +39,3 @@ weights:
- analytics_pipeline_hadoop_resourcemanager: 2
- analytics_pipeline_spark_master: 1
- analytics_pipeline_spark_worker: 1

0 comments on commit a856a43

Please sign in to comment.