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
173bd797
Commit
173bd797
authored
Nov 22, 2016
by
Feanil Patel
Committed by
GitHub
Nov 22, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3489 from edx/feanil/run_make_without_errors_locally
Allow make to run locally without throwing errors.
parents
c54997a9
ce934bef
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
docker.mk
+2
-1
test.mk
+1
-1
util/balancecontainers.py
+1
-1
util/docker_images.py
+1
-1
No files found.
docker.mk
View file @
173bd797
...
...
@@ -4,7 +4,8 @@ SHARD=0
SHARDS
=
1
dockerfiles
:=
$(
shell
ls
docker/build/
*
/Dockerfile
)
images
:=
$(
shell
git diff
--name-only
$(TRAVIS_COMMIT_RANGE)
| python util/parsefiles.py
)
all_images
:=
$
(
patsubst docker/build/%/Dockerfile,%,
$(dockerfiles)
)
images
:=
$
(
if
$(TRAVIS_COMMIT_RANGE)
,
$(
shell
git diff
--name-only
$(TRAVIS_COMMIT_RANGE)
| python util/parsefiles.py
)
,
$(all_images)
)
docker_build
=
docker.build.
docker_test
=
docker.test.
...
...
test.mk
View file @
173bd797
...
...
@@ -2,7 +2,7 @@
yml_files:=$(shell find . -name "*.yml")
json_files:=$(shell find . -name "*.json")
jinja_files:=$(shell find . -name "*.j2")
images = $(
shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py
)
images = $(
if $(TRAVIS_COMMIT_RANGE), $(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py), $(all_images)
)
test: test.syntax test.edx_east_roles
...
...
util/balancecontainers.py
View file @
173bd797
...
...
@@ -7,7 +7,7 @@ import argparse
import
logging
import
docker_images
TRAVIS_BUILD_DIR
=
os
.
environ
.
get
(
"TRAVIS_BUILD_DIR"
)
TRAVIS_BUILD_DIR
=
os
.
environ
.
get
(
"TRAVIS_BUILD_DIR"
,
""
)
CONFIG_FILE_PATH
=
pathlib2
.
Path
(
TRAVIS_BUILD_DIR
,
"util"
,
"parsefiles_config.yml"
)
LOGGER
=
logging
.
getLogger
(
__name__
)
...
...
util/docker_images.py
View file @
173bd797
...
...
@@ -4,7 +4,7 @@ import pathlib2
import
itertools
import
sys
TRAVIS_BUILD_DIR
=
os
.
environ
.
get
(
"TRAVIS_BUILD_DIR"
)
TRAVIS_BUILD_DIR
=
os
.
environ
.
get
(
"TRAVIS_BUILD_DIR"
,
""
)
CONFIG_FILE_PATH
=
pathlib2
.
Path
(
TRAVIS_BUILD_DIR
,
"util"
,
"parsefiles_config.yml"
)
def
get_used_images
(
images
):
...
...
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