19 files changed, 94 insertions, 34 deletions
diff --git a/build/Makefile b/build/Makefile
index e836de117..c8fc79385 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -57,14 +57,11 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" |
 
 export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py)
 
-# Short circuiting normal package selection as this seems currently broken, see
-# hard coding in config.mk
-# 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 LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
-# 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/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
-# export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
+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)
+export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
+export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
 
 # uncomment and use: make print-VARIABLE
 #print-%  : ; @echo $* = $($*)
diff --git a/build/config.mk b/build/config.mk
index 6297a271e..56317cb78 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -33,23 +33,6 @@ F_OPNFV_TAG  := ${FUEL_MAIN_TAG}-opnfv
 FUEL_MAIN_REPO := ${F_SUBMOD_DIR}/fuel-main
 
 
-
-# Settings for Fuel 10 BEGIN
-#
-# Currently it seems impossible to build Fuel 10 from upstream without
-# hard coding specific repositories. The Fuel Ubuntu mirror seems to not
-# have been fully populated.
-
-export MIRROR_UBUNTU?=cz.archive.ubuntu.com
-export MIRROR_UBUNTU_ROOT?=/ubuntu/
-export MIRROR_MOS_UBUNTU?=mirror.seed-cz1.fuel-infra.org
-export MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/xenial//snapshots/master-2016-10-10-100022
-export MIRROR_CENTOS?=http://mirror.seed-cz1.fuel-infra.org/pkgs/snapshots/centos-7.2.1511-2016-08-07-170016
-export MIRROR_FUEL?=http://mirror.seed-cz1.fuel-infra.org//mos-repos/centos/mos-master-centos7//snapshots/os-2016-10-18-120021/x86_64
-export MIRROR_MOS_UBUNTU_SUITE?=mos-master
-
-# Settings for Fuel 10 END
-
 export FUELLIB_REPO?=${F_SUBMOD_DIR}/fuel-library
 export NAILGUN_REPO?=${F_SUBMOD_DIR}/fuel-web
 export PYTHON_FUELCLIENT_REPO?=${F_SUBMOD_DIR}/python-fuelclient
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 13f69b942..e189e1697 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,7 +11,7 @@
 # Add Fuel plugin build targets here
 # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have
 # verified it!
-PLUGINS = f_ovs-nsh-dpdk-pluginbuild
+PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild
 export PLUGINS
 NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild
 
diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index eaef3d414..fa284b3e2 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-KVMFORNFV_BRANCH=stable/colorado
+KVMFORNFV_BRANCH=master
 KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
-KVMFORNFV_CHANGE=e6588d1d59d7ac24f25f644650e6845561dd441b
+KVMFORNFV_CHANGE=ec568fdb37d280371733cab5e9fad030557f6921
diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
index 35f4059f1..82f0723e0 100644
--- a/build/f_isoroot/f_vsperfpluginbuild/config.mk
+++ b/build/f_isoroot/f_vsperfpluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-VSPERF_BRANCH?=5a0c6772d255aeb0ab1e6246c91bbeb56bb3a239
+VSPERF_BRANCH?=efdc282f4b08e96f3e09d43f94ba0508e4f26090
 VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git
 VSPERF_CHANGE?=
diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile
index f09dbedd1..be6f82909 100644
--- a/build/f_repos/Makefile
+++ b/build/f_repos/Makefile
@@ -34,10 +34,7 @@ include ../config.mk
 
 # To enable remote tracking, set the following var to any non-empty string.
 # Leaving this var empty will bind each git submodule to its saved commit.
-# NOTE: For non-stable branches, unless overriden, always track remotes
-# Need to disable this logic temporarily as Newton doesn't seem to have stable
-# branches in all repos. /Stefan
-# FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable)
+FUEL_TRACK_REMOTES ?= yes
 
 .PHONY: all
 all: release
diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
index 820e387d0..d01ce8bf3 100644
--- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
+++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
@@ -41,7 +41,7 @@ index dbcac5f..1826390 100755
  # Enable sshd
 -systemctl enable sshd
 -systemctl start sshd
-+systemctl reload sshd
++systemctl restart sshd
  
  # Enable iptables
  systemctl enable iptables.service
diff --git a/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch b/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch
new file mode 100644
index 000000000..734523040
--- /dev/null
+++ b/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch
@@ -0,0 +1,24 @@
+From: Artem Silenkov <asilenkov@mirantis.com>
+Date: Tue, 22 Sep 2015 21:54:44 +0300
+Subject: [PATCH] xorriso fails to add files with path longer then 240
+
+joliet-long option added to xorriso command line
+
+Change-Id: I97016cf3e6a554f44d839740ba7d210337435cdc
+Related-Bug: #1498619
+---
+ iso/module.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/iso/module.mk b/iso/module.mk
+index 8995378..0073068 100644
+--- a/iso/module.mk
++++ b/iso/module.mk
+@@ -174,6 +174,7 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
+ 		-V $(ISO_VOLUME_ID) -p $(ISO_VOLUME_PREP) \
+ 		-J -R \
+ 		-graft-points \
++		-joliet-long \
+ 		-b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
+ 		-isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
+ 		-eltorito-alt-boot -e images/efiboot.img -no-emul-boot \
diff --git a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
new file mode 100644
index 000000000..a31c52b95
--- /dev/null
+++ b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
@@ -0,0 +1,59 @@
+From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
+Date: Thu, 25 Feb 2016 13:31:19 +0100
+Subject: [PATCH] repo mirror: Allow multi-arch local mirrors
+
+This patch allows specifying multiple architectures via UBUNTU_ARCH in
+form of a list of space separated architectures. The first architecture
+in the list is considered primary and will be used for building all the
+deb packages by fuel-main. Additional architectures are added to allow
+targets of other architectures to use the mirror.
+NOTE: this imposes a requirement that all packages built are arch
+independent (which is true so far).
+
+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ config.mk               | 2 +-
+ mirror/ubuntu/module.mk | 2 +-
+ sandbox.mk              | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config.mk b/config.mk
+index 7f7d965..83c3810 100644
+--- a/config.mk
++++ b/config.mk
+@@ -48,7 +48,7 @@ UBUNTU_MINOR?=04
+ UBUNTU_RELEASE_NUMBER:=$(UBUNTU_MAJOR).$(UBUNTU_MINOR)
+ UBUNTU_KERNEL_FLAVOR?=lts-xenial
+ UBUNTU_NETBOOT_FLAVOR?=netboot
+-UBUNTU_ARCH:=amd64
++UBUNTU_ARCH?=amd64
+ UBUNTU_IMAGE_RELEASE:=$(UBUNTU_MAJOR)$(UBUNTU_MINOR)
+ SEPARATE_IMAGES?=/boot,ext2 /,ext4
+
+diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
+index 7a9466e..fe1ada2 100644
+--- a/mirror/ubuntu/module.mk
++++ b/mirror/ubuntu/module.mk
+@@ -81,7 +81,7 @@ $(BUILD_DIR)/mirror/ubuntu/mirror.done:
+ 	--root=$(MIRROR_MOS_UBUNTU_ROOT) \
+ 	--dist=$(MIRROR_MOS_UBUNTU_SUITE) \
+ 	--section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
+-	--arch=$(UBUNTU_ARCH) \
++	--arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \
+ 	$(LOCAL_MIRROR_UBUNTU)/
+ 	rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
+ 	$(ACTION.TOUCH)
+diff --git a/sandbox.mk b/sandbox.mk
+index 9d34dc9..e787f43 100644
+--- a/sandbox.mk
++++ b/sandbox.mk
+@@ -199,7 +199,7 @@ touch $(SANDBOX_UBUNTU)/etc/init.d/.legacy-bootordering
+ mkdir -p $(SANDBOX_UBUNTU)/usr/sbin
+ cp -a $(BUILD_DIR)/policy-rc.d $(SANDBOX_UBUNTU)/usr/sbin
+ echo "Running debootstrap"
+-sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(UBUNTU_ARCH) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
++sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(word 1,$(UBUNTU_ARCH)) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
+ if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
+ sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
+ if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi
diff --git a/build/f_repos/sub/fuel-agent b/build/f_repos/sub/fuel-agent
-Subproject 075fc9e2572330416ec0aad45bce969baa43b4f
+Subproject 7d35078a9d67a9015f49f5813dbad225837095a
diff --git a/build/f_repos/sub/fuel-astute b/build/f_repos/sub/fuel-astute
-Subproject bca595a964e4f45798f393bb0bbc685605cae09
+Subproject 87ba44dcde92a0bfe50fdba6e0a2f271e685991
diff --git a/build/f_repos/sub/fuel-library b/build/f_repos/sub/fuel-library
-Subproject 2cd11d3a506f9039b7bfd2f3b720df7f1244df9
+Subproject 0281ca8ee1900271252edc5e6e1ceb2112cfd0d
diff --git a/build/f_repos/sub/fuel-main b/build/f_repos/sub/fuel-main
-Subproject 70749a24518b98e1162d60abdcd2c25c9ffa92e
+Subproject a0f955fc5bff09c02d538ae2c9a7373b6ee511e
diff --git a/build/f_repos/sub/fuel-menu b/build/f_repos/sub/fuel-menu
-Subproject 1a94d657ecaca4a1b549141ee22e5bc7ca20822
+Subproject 9aedc10ffea536d7d353cb5869c492a1729a98f
diff --git a/build/f_repos/sub/fuel-nailgun-agent b/build/f_repos/sub/fuel-nailgun-agent
-Subproject af1e5da094c2975230da29f808b26645231841d
+Subproject 0cfe06be939f92c3a8158a0e8a96a7ab8cf5403
diff --git a/build/f_repos/sub/fuel-ostf b/build/f_repos/sub/fuel-ostf
-Subproject ddd691205d7dccfc9a9b52cc2681cdb367c82d2
+Subproject 132f287fb769276cde63ac283222d5447bc6830
diff --git a/build/f_repos/sub/fuel-ui b/build/f_repos/sub/fuel-ui
-Subproject 2a22c985eeeb3adf2a18f3f56abdcc841caab25
+Subproject 5b66f907e628ba16d03a3fd3f259099b727a5fa
diff --git a/build/f_repos/sub/fuel-web b/build/f_repos/sub/fuel-web
-Subproject 118b9231a48f9341d72990ab3cc65f375d2423c
+Subproject d04c1108b2b19e5d681a07fd3492b93d133c461
diff --git a/build/f_repos/sub/python-fuelclient b/build/f_repos/sub/python-fuelclient
-Subproject 870261942796f367ec046341ba095f7ac518f40
+Subproject 8ac48ac48facc47923ba00c09bf96080ca88d31