X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=build%2FMakefile;h=550f360f9f8ddff6b3ae93afdd3826c0f4fe9c44;hb=decf2f5ba5dc51b34b26ea6eced417b93ab6a912;hp=6a74ad9419cf15c6c105125f59c869161385dc30;hpb=80b903bcafeaf10c8d4f1270599d1c770703abab;p=fuel.git

diff --git a/build/Makefile b/build/Makefile
index 6a74ad941..550f360f9 100644
--- 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!
@@ -43,6 +43,24 @@ export DOCKERIMG = opnfv.org/ubuntu-builder:14.04
 export TOPDIR := $(shell pwd)
 export REPOINFO  := $(BUILD_BASE)/repo_info.sh
 
+# Use snapshots
+# Use nearby repositories
+export MIRROR_UBUNTU_URL := $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh --url)
+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://$(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 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"
+
+# uncomment and use: make print-VARIABLE
+#print-%  : ; @echo $* = $($*)
+
 #Build subclasses
 
 SUBDIRS := f_isoroot
@@ -103,6 +121,10 @@ $(ISOCACHE):
 	sudo ./fuel_build_loop
 	cp /tmp/fuel-main/build/artifacts/fuel*.iso .
 
+	# Attempt to store ISO in cache to speed up the next
+	# build attempt. If cache is not enabled no harm is done.
+	$(MAKE) -f Makefile put-cache
+
 .PHONY: mount-origiso umount-origiso
 mount-origiso: $(ISOCACHE)
 	@echo "Mounting original ISO in $(ORIGDIR)"