Merge changes from topic 'multiarch-mirrors'

* changes:
  build: cache: Consider UBUNTU_ARCH in .cacheid
  repo mirror: Allow multi-arch local mirrors

diff --combined build/Makefile
index b3905e3,6f39dc9..fa70869
--- 1/build/Makefile
--- 2/build/Makefile
+++ b/build/Makefile
@@@ -57,7 -57,7 +57,7 @@@ export MIRROR_UBUNTU_ROOT := $(shell ec
  
  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 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/$(MOSVERSION).target.txt" | head -1)
  export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
  
@@@ -135,6 -135,7 +135,7 @@@ $(ISOCACHE)
        cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch
        cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch
        cd /tmp/fuel-main/build/repos/fuel-nailgun && git am $(TOPDIR)/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
+       cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch
        # Repeat build up to three times
        sudo -E ./fuel_build_loop
        cp /tmp/fuel-main/build/artifacts/fuel*.iso .