Create local mirrors for offline installation

[fuel.git] / build / Makefile

diff --git a/build/Makefile b/build/Makefile
index 1d28db3..ab60f00 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -25,9 +25,9 @@ export REVSTATE = "P0000"
 
 ifdef BUILD_FUEL_PLUGINS
 $(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS))
-export NEWISO = $(shell pwd)/release/unofficial-opnfv-fuel-${REVSTATE}.iso
+export NEWISO = $(shell pwd)/release/unofficial-opnfv-${REVSTATE}.iso
 else
-export NEWISO = $(shell pwd)/release/opnfv-fuel-${REVSTATE}.iso
+export NEWISO = $(shell pwd)/release/opnfv-${REVSTATE}.iso
 endif
 
 # Note! Invoke with "make REVSTATE=RXXXX all" to make release build!
@@ -49,11 +49,11 @@ export MIRROR_UBUNTU_URL := $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.s
 export MIRROR_UBUNTU := $(shell echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f3 )
 export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f4-)
 
-export LATEST_MIRROR_ID_URL := http://mirror.seed-us1.fuel-infra.org
+export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py)
 
 export MIRROR_MOS_UBUNTU := $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3)
 export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/8.0.target.txt" | head -1)
-export MIRROR_MOS_UBUNTU_ROOT := "/mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)"
+export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
 
 export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos8.0-centos7-fuel/os.target.txt" | head -1)
 export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos8.0-centos7-fuel/$(LATEST_TARGET_CENTOS)/x86_64"
@@ -110,14 +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
        # 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)