diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-03-27 20:23:35 +0100 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-03-27 22:22:40 +0100 |
| commit | 9c1262c5d882a34c6ddf5ad50297d05a1608edc0 (patch) | |
| tree | cdbdbb0985e025ce88878b7483d4c6922dc7fc71 | |
| parent | 2de197be04b871b437e35b55ca7f48d921595303 (diff) | |
--- Fuel build system bug fix ---
- Adding force remove of docker images to avoid non zero returns to CI and disk usage growth
- Fixed another bug with caching, disabled cache for odl build from source since we're not currently
building ODL from source!
READY TO MERGE
JIRA:
Change-Id: I1478002cbe1574814d2597ffa5ec64b6ed9580b7
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
| -rw-r--r-- | fuel/build/cache.mk | 6 | ||||
| -rwxr-xr-x | fuel/build/docker/runcontext | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fuel/build/cache.mk b/fuel/build/cache.mk index a2aa1d5..cc98f68 100644 --- a/fuel/build/cache.mk +++ b/fuel/build/cache.mk @@ -15,10 +15,10 @@ CACHECLEAN := $(addsuffix .clean,$(CACHEFILES) $(CACHEDIRS)) ############################################################################ # BEGIN of variables to customize # -CACHEDIRS := opendaylight/f_odl/package +#CACHEDIRS := opendaylight/f_odl/package -CACHEFILES := opendaylight/.odl-build-history -CACHEFILES += opendaylight/.odl-build.log +#CACHEFILES := opendaylight/.odl-build-history +#CACHEFILES += opendaylight/.odl-build.log CACHEFILES += .versions CACHEFILES += $(shell basename $(ISOSRC)) # diff --git a/fuel/build/docker/runcontext b/fuel/build/docker/runcontext index cf116fc..52b46ad 100755 --- a/fuel/build/docker/runcontext +++ b/fuel/build/docker/runcontext @@ -31,5 +31,5 @@ echo command: docker run ${RUN_CONTEXT_OPT} $CID "$@" docker run ${RUN_CONTEXT_OPT} $CID "$@" rc=$? -docker rmi $CID > /dev/null +docker rmi -f $CID > /dev/null exit $rc |