11 files changed, 248 insertions, 11 deletions
diff --git a/build/cache.mk b/build/cache.mk
index f6db01797..a65f310d0 100644
--- a/build/cache.mk
+++ b/build/cache.mk
@@ -51,5 +51,5 @@ cache:
 		exit 1; \
 	fi
 	@docker version >/dev/null 2>&1 || (echo 'No Docker installation available'; exit 1)
-	@make -C docker
+	@make -C docker get-cache all
 	docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) cached-all
diff --git a/build/docker/.gitignore b/build/docker/.gitignore
new file mode 100644
index 000000000..2585910ce
--- /dev/null
+++ b/build/docker/.gitignore
@@ -0,0 +1,2 @@
+.docker*
+ubuntu-builder/Dockerfile
diff --git a/build/docker/Makefile b/build/docker/Makefile
index d4423b0a2..783881e8d 100644
--- a/build/docker/Makefile
+++ b/build/docker/Makefile
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
+# Copyright (c) 2015,2016 Ericsson AB and others.
 # stefan.k.berg@ericsson.com
 # jonas.bjurel@ericsson.com
 # All rights reserved. This program and the accompanying materials
@@ -12,6 +12,15 @@ SHELL = /bin/bash
 FILES = $(wildcard ubuntu-builder/*) runcontext
 DOCKER_VER := $(shell [[ "$$(docker version --format '{{.Client.Version}}')" =~ ([0-9]+)\.([0-9]+) ]] && echo $$(( $${BASH_REMATCH[1]} * 100 + $${BASH_REMATCH[2]} )))
 
+# Builder tag lifespan, force container rebuild X days after tag creation
+DOCKER_KEEP = 1 days
+DOCKER_IMG  = opnfv.org/ubuntu-builder
+DOCKER_TAG  = ${DOCKER_IMG}:14.04
+# Shell contruct for checking our tag object did not expire
+DOCKER_EXPIRED = D_TAG_BIRTH=`docker inspect --format="{{.Created}}" \
+	${DOCKER_TAG} 2>/dev/null`; test -z "$$D_TAG_BIRTH" -o `date +%s` -gt \
+	`date -d "$$D_TAG_BIRTH +${DOCKER_KEEP}" +%s`; echo $$?
+
 # Don't use -f flag when docker is newer than 1.9
 # https://docs.docker.com/engine/deprecated/#/f-flag-on-docker-tag
 ifeq ($(shell echo "$(DOCKER_VER)>109" | bc), 1)
@@ -23,7 +32,7 @@ endif
 .PHONY: all
 all:	.docker
 
-.docker: $(FILES)
+.dockercfg: $(FILES)
 	cp Dockerfile ubuntu-builder/Dockerfile
 	# Only add proxy ENVs where set in host - needed to pull the base Ubuntu image
 	test -n "${http_proxy}" && sed -i "s;INSERT_HTTP_PROXY;${http_proxy};" ubuntu-builder/Dockerfile || exit 0
@@ -33,10 +42,62 @@ all:	.docker
 	test -n "${HTTPS_PROXY}" && sed -i "s;INSERT_HTTPS_PROXY;${HTTPS_PROXY};" ubuntu-builder/Dockerfile || exit 0
 	test -n "${NO_PROXY}" && sed -i "s;INSERT_NO_PROXY;${NO_PROXY};" ubuntu-builder/Dockerfile || exit 0
 	sed -i '/INSERT_/d' ubuntu-builder/Dockerfile
-	/usr/bin/docker build --rm=true --no-cache=true -t opnfv.org/ubuntu-builder:14.04 ubuntu-builder
-	/usr/bin/docker tag ${tag_flags} opnfv.org/ubuntu-builder:14.04 opnfv.org/ubuntu-builder
-	touch .docker
+	touch $@
+
+.docker: .dockercfg
+	@if test -f .cacheid -o "$(shell ${DOCKER_EXPIRED})" -eq "0"; then \
+		/usr/bin/docker build --rm=true --no-cache=true \
+			-t ${DOCKER_TAG} ubuntu-builder && \
+		/usr/bin/docker tag ${tag_flags} ${DOCKER_TAG} ${DOCKER_IMG}; \
+	else \
+		echo "Docker: Tag '${DOCKER_TAG}' was created less than" \
+			"${DOCKER_KEEP} ago, skipping re-build."; \
+	fi
+	touch $@
+	test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
 
 .PHONY:	clean
 clean:
-	rm -f .docker ubuntu-builder/Dockerfile
+	rm -f .docker* ubuntu-builder/Dockerfile
+
+.PHONY: deepclean
+deepclean: clean clean-cache
+
+##############################################################################
+# Cache operations - only used when building through ci/build.sh
+##############################################################################
+
+# NOTE: For docker, we only get/put cache to fingerprint build scripts and
+# env vars, its cached data holds only an empty .docker file.
+
+# Create a unique hash to be used for getting and putting cache, based on:
+#   - ubuntu-builder Dockerfile (includes eventual proxy env vars), runcontext;
+#   - The contents of this Makefile
+.cacheid: .dockercfg
+	sha1sum Makefile runcontext $(wildcard ubuntu-builder/*) > .cachedata
+	cat .cachedata | $(CACHETOOL) getid > .cacheid
+
+# Clean local data related to caching - called prior to ordinary build
+.PHONY: clean-cache
+clean-cache:
+	rm -f .cachedata .cacheid
+
+# Try to download cache - called prior to ordinary build
+.PHONY: get-cache
+get-cache: .cacheid
+	@if $(CACHETOOL) check $(shell cat .cacheid); then \
+		if test "$(shell ${DOCKER_EXPIRED})" -eq "0"; then \
+			echo "Docker: Tag '${DOCKER_TAG}' missing" \
+				"or older than ${DOCKER_KEEP}, not using it."; \
+		else \
+			touch .docker; \
+		fi; \
+	else \
+		echo "No cache item found for $(shell cat .cacheid)" ;\
+		exit 0;\
+	fi
+
+# Store cache if not already stored - called after ordinary build
+.PHONY: put-cache
+put-cache: .cacheid
+	@tar cf - .docker | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 448f4158c..1539783c9 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 Mitaka uplift. Please re-enable your plugin as you have
 # verified it!
-PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild
+PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild f_tacker-pluginbuild
 #PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
 export PLUGINS
 #NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index 9fb2f9283..eaef3d414 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=b1c117f1c8414bddbe4370414590f5f0b62ae4d1
+KVMFORNFV_BRANCH=stable/colorado
 KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
-KVMFORNFV_CHANGE=
+KVMFORNFV_CHANGE=e6588d1d59d7ac24f25f644650e6845561dd441b
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
index ec67666dc..8effbd26b 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-OVS_NSH_DPDK_BRANCH?=42160542e6e9151f5f44b738d8d76e88911cd07f
+OVS_NSH_DPDK_BRANCH?=074aadce66ef3cf322a00a3cff5c57deb84088b5
 OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
 OVS_NSH_DPDK_CHANGE?=
diff --git a/build/f_isoroot/f_tacker-pluginbuild/Makefile b/build/f_isoroot/f_tacker-pluginbuild/Makefile
new file mode 100644
index 000000000..997430de1
--- /dev/null
+++ b/build/f_isoroot/f_tacker-pluginbuild/Makefile
@@ -0,0 +1,91 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# geopar@intracom-telecom.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+TOP := $(shell pwd)
+
+############################################################################
+# BEGIN of Include definitions
+#
+include config.mk
+#
+# END Include definitions
+#############################################################################
+
+
+.PHONY: all
+all: .tackerbuild
+
+.PHONY: clean
+clean:
+	@rm -f .tackerbuild ../release/opnfv/tacker*.rpm tacker*.rpm
+	@rm -f $(BUILD_BASE)/gitinfo_tackerplugin.txt gitinfo_tackerplugin.txt
+
+.PHONY: release
+release:.tackerbuild
+	@rm -f ../release/opnfv/tacker*.rpm
+	@mkdir -p ../release/tacker
+	@cp tacker*.rpm ../release/opnfv/
+	cp gitinfo_tackerplugin.txt $(BUILD_BASE)
+
+.tackerbuild:
+	rm -rf fuel-plugin-tacker
+	git clone $(TACKER_REPO)
+	cd fuel-plugin-tacker; \
+	git checkout $(TACKER_BRANCH); \
+	if [ ! -z $(TACKER_CHANGE) ]; then \
+	   git fetch $(TACKER_REPO) $(TACKER_CHANGE); \
+	   git checkout FETCH_HEAD; \
+	fi
+	fpb --debug --build fuel-plugin-tacker/
+	@mv fuel-plugin-tacker/tacker*.rpm .
+	$(REPOINFO) -r . > gitinfo_tackerplugin.txt
+	@rm -rf fuel-plugin-tacker
+	@touch .tackerbuild
+	# 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
+
+#############################################################################
+# Cache operations - only used when building through ci/build.sh
+#############################################################################
+
+
+# Create a unique hash to be used for getting and putting cache, based on:
+#   - The SHA1 hash of the HEAD on the plugin repo's $(TACKER_BRANCH)
+#   - The contents of this Makefile
+.cacheid:
+	@if [ ! -z $(TACKER_CHANGE) ]; then \
+	  $(CACHETOOL) getcommitid $(TACKER_REPO) $(TACKER_CHANGE) > .cachedata; \
+	else \
+	  $(CACHETOOL) getcommitid $(TACKER_REPO) $(TACKER_BRANCH) > .cachedata; \
+	fi
+	@sha1sum Makefile | awk {'print $$1'} >> .cachedata
+	@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+	@echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
+	@cat .cachedata | $(CACHETOOL) getid > .cacheid
+
+# Clean local data related to caching - called prior to ordinary build
+.PHONY: clean-cache
+clean-cache: clean
+	@rm -f .cachedata .cacheid
+
+# Try to download cache - called prior to ordinary build
+.PHONY: get-cache
+get-cache: .cacheid
+	@if $(CACHETOOL) check $(shell cat .cacheid); then \
+		 $(CACHETOOL) get $(shell cat .cacheid) | tar xf -;\
+	else \
+		echo "No cache item found for $(shell cat .cacheid)" ;\
+		exit 0;\
+	fi
+
+# Store cache if not already stored - called after ordinary build
+.PHONY: put-cache
+put-cache: .cacheid
+	@tar cf - .tackerbuild tacker*.rpm gitinfo_tackerplugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_tacker-pluginbuild/config.mk b/build/f_isoroot/f_tacker-pluginbuild/config.mk
new file mode 100644
index 000000000..2de94d57e
--- /dev/null
+++ b/build/f_isoroot/f_tacker-pluginbuild/config.mk
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# geopar@intracom-telecom.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+TACKER_BRANCH?=master
+TACKER_REPO?="https://github.com/openstack/fuel-plugin-tacker"
+TACKER_CHANGE?=e49db23fa2392e2cc42ac15ce22e869ff9cb0e0c
diff --git a/build/f_isoroot/f_tacker-pluginbuild/packages.yaml b/build/f_isoroot/f_tacker-pluginbuild/packages.yaml
new file mode 100644
index 000000000..c7775d120
--- /dev/null
+++ b/build/f_isoroot/f_tacker-pluginbuild/packages.yaml
@@ -0,0 +1,3 @@
+packages:
+  - python-jsonrpclib
+
diff --git a/build/patch-repos/0040-xorriso-fails-to-add-files-with-path-longer-then-240.patch b/build/patch-repos/0040-xorriso-fails-to-add-files-with-path-longer-then-240.patch
new file mode 100644
index 000000000..734523040
--- /dev/null
+++ b/build/patch-repos/0040-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/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch b/build/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch
new file mode 100644
index 000000000..4d5be493b
--- /dev/null
+++ b/build/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch
@@ -0,0 +1,44 @@
+From ba542dde34743b276547b7ca3c6591feb9000877 Mon Sep 17 00:00:00 2001
+From: iberezovskiy <iberezovskiy@mirantis.com>
+Date: Mon, 19 Sep 2016 12:35:05 +0300
+Subject: [PATCH] Disable token revoke to increase keystone performance
+
+Change-Id: I4df816369093908ad1eac372f38c92155efbe8e0
+Closes-bug: #1625077
+---
+ .../openstack_tasks/manifests/keystone/keystone.pp |    2 ++
+ tests/noop/spec/hosts/keystone/keystone_spec.rb    |    5 +++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
+index 3162287..ba9d7df 100644
+--- a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
++++ b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
+@@ -327,6 +327,8 @@ class openstack_tasks::keystone::keystone {
+       memcache_pool_unused_timeout => '60',
+       cache_memcache_servers       => $memcache_servers,
+       policy_driver                => 'keystone.policy.backends.sql.Policy',
++      # Set revoke_by_id to false according to LP #1625077
++      revoke_by_id                 => false,
+     }
+ 
+     Package<| title == 'keystone'|> ~> Service<| title == 'keystone'|>
+diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb
+index b29e691..3c0f847 100644
+--- a/tests/noop/spec/hosts/keystone/keystone_spec.rb
++++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb
+@@ -176,6 +176,11 @@ describe manifest do
+         should contain_class('keystone').with('sync_db' => primary_controller)
+     end
+ 
++    it 'should declare keystone class with revoke_by_id set to false' do
++      # Set revoke_by_id to false according to LP #1625077
++      should contain_class('keystone').with('revoke_by_id' => false)
++    end
++
+     it 'should configure keystone with paramters' do
+       should contain_keystone_config('token/caching').with(:value => 'false')
+       should contain_keystone_config('cache/enabled').with(:value => 'true')
+-- 
+1.7.9.5
+