From: Stefan K. Berg <stefan.k.berg@ericsson.com>
Date: Wed, 27 Jan 2016 12:38:42 +0000 (+0000)
Subject: Merge "Revert "Fix build failure in fuel base & qemu""
X-Git-Tag: colorado.1.rc1~254
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0cc989a2376c6f9c8171a556c7fa7869f4635dc6;p=fuel.git

Merge "Revert "Fix build failure in fuel base & qemu""
---

0cc989a2376c6f9c8171a556c7fa7869f4635dc6
diff --cc build/Makefile
index f77a14538,84fddc3ae..3d7dd634d
--- a/build/Makefile
+++ b/build/Makefile
@@@ -110,19 -92,13 +110,18 @@@ $(ISOCACHE)
  	# Need to replace the old Docker v. 1.5.0 with a later version to be
  	# able to access the Docker remote repository!
  	cd /tmp/fuel-main && patch -f -p0 < $(TOPDIR)/fuel-main_docker_version.patch
- 	# cd /tmp/fuel-main && patch -f -p0 < $(TOPDIR)/fuel-main_docker_dns.patch
  	#
  	cd /tmp/fuel-main && ./prepare-build-env.sh
 +	# Verify that Docker is alive
 +	sudo docker info
  	cd /tmp/fuel-main && make repos
  	$(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt
 -	#
 -	cd /tmp/fuel-main && sudo make iso
 +	# Repeat build up to ten times
 +	sudo ./fuel_build_loop
  	cp /tmp/fuel-main/build/artifacts/fuel*.iso .
 +	# Store artifact in cache straight away if caching is enabled
 +	# (no .cacheid will be present unless this is a cached build)
 +	test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
  
  .PHONY: mount-origiso umount-origiso
  mount-origiso: $(ISOCACHE)