--- 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>

diff --git a/fuel/build/cache.mk b/fuel/build/cache.mk
index a2aa1d5..cc98f68 100644 (file)
--- 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 (executable)
--- 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