Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
610b0648
Commit
610b0648
authored
Jun 15, 2018
by
isabelgk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include go-server in config file for Travis
parent
712da392
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
docker.mk
+2
-4
util/parsefiles_config.yml
+1
-1
No files found.
docker.mk
View file @
610b0648
...
...
@@ -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.
...
...
@@ -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))
...
...
@@ -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
$<
.
...
...
util/parsefiles_config.yml
View file @
610b0648
...
...
@@ -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
...
...
@@ -38,4 +39,3 @@ weights:
-
analytics_pipeline_hadoop_resourcemanager
:
2
-
analytics_pipeline_spark_master
:
1
-
analytics_pipeline_spark_worker
:
1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment