build, deploy: Remove obsolete Fuel@Openstack code

JIRA: FUEL-278 Change-Id: I30c04c325de5ac97aee172386de43201988646c5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
author: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 2017-08-31 02:32:05 +0200
committer: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 2017-09-03 04:27:00 +0200
commit: 1b89628e4571a65245a743e4a85d38438a119b3d (patch)
tree: 6b31ac6ab1d5e2197cf2e922ae317d8db237e303 /build/f_isoroot
parent: 98f171c82636c29a9cfd5c94c8e7aac7ca7af41b (diff)
40 files changed, 0 insertions, 2093 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
deleted file mode 100644
index 0e203bbba..000000000
--- a/build/f_isoroot/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-# Add Fuel plugin build targets here
-PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_tacker-pluginbuild f_onosfwpluginbuild
-export PLUGINS
-
-
-# If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
-# indicated therein.
-ifdef BUILD_FUEL_PLUGINS
-export BUILD_FUEL_PLUGINS
-SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS)
-$(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS))
-else
-SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS)
-endif
-SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
-
-.PHONY: all
-all:	$(SUBDIRS)
-
-.PHONY: $(SUBDIRS)
-$(SUBDIRS):
-	@mkdir -p release
-	$(MAKE) -C $@ -f Makefile release
-
-.PHONY: clean $(SUBCLEAN)
-clean: $(SUBCLEAN)
-	@rm -Rf release
-
-$(SUBCLEAN): %.clean:
-	$(MAKE) -C $* -f Makefile clean
-
-.PHONY: release
-release: $(SUBDIRS)
-	@cp -Rvp release/* ../release/isoroot
-
-include cache.mk
diff --git a/build/f_isoroot/README b/build/f_isoroot/README
deleted file mode 100644
index eb54c0827..000000000
--- a/build/f_isoroot/README
+++ /dev/null
@@ -1,16 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-This is to (a) replace/patch existing Fuel ISO files as well
-as adding new information directly into the ISO structure
-
-Please separate changes into "patches" and new content into
-"additions". Both directories will be anchored at the ISO file
-root.
diff --git a/build/f_isoroot/cache.mk b/build/f_isoroot/cache.mk
deleted file mode 100644
index 2df3b6bd1..000000000
--- a/build/f_isoroot/cache.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-##############################################################################
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#
-# This file is only meant for a top Makefile which is only calling its
-# own SUBDIRS, without building any cachable artifact by itself.
-#############################################################################
-
-# Call sub caches
-SUBGETCACHE = $(addsuffix .getcache,$(SUBDIRS))
-$(SUBGETCACHE): %.getcache:
-	$(MAKE) -C $* -f Makefile get-cache
-
-SUBPUTCACHE = $(addsuffix .putcache,$(SUBDIRS))
-$(SUBPUTCACHE): %.putcache:
-	$(MAKE) -C $* -f Makefile put-cache
-
-SUBCLEANCACHE = $(addsuffix .cleancache,$(SUBDIRS))
-$(SUBCLEANCACHE): %.cleancache:
-	$(MAKE) -C $* -f Makefile clean-cache
-
-.PHONY: get-cache
-get-cache: $(SUBGETCACHE)
-
-.PHONY: put-cache
-put-cache: $(SUBPUTCACHE)
-
-.PHONY: clean-cache
-clean-cache: $(SUBCLEANCACHE)
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
deleted file mode 100644
index a236b63b4..000000000
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@ericsson.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: .bgpvpnbuild
-
-.PHONY: clean
-clean:
-	@rm -f .bgpvpnbuild ../release/opnfv/bgpvpn*.rpm bgpvpn*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_bgpvpnplugin.txt gitinfo_bgpvpnplugin.txt
-
-.PHONY: release
-release:.bgpvpnbuild
-	@rm -f ../release/opnfv/bgpvpn*.rpm
-	@mkdir -p ../release/bgpvpn
-	@cp bgpvpn*.rpm ../release/opnfv/
-	cp gitinfo_bgpvpnplugin.txt $(BUILD_BASE)
-
-.bgpvpnbuild:
-	# The python packages build into deb by this plugin require a newer
-	# setuptools install a newer setuptools version until the container
-	# where this is run is bumped to ubuntu 16.04.
-	# --user is used because there is already a setuptools installation
-	#  managed by apt.
-	pip install setuptools --upgrade --user
-	rm -rf fuel-plugin-bgpvpn
-	git clone $(BGPVPN_REPO)
-	cd fuel-plugin-bgpvpn; \
-	git checkout $(BGPVPN_BRANCH); \
-	if [ ! -z $(BGPVPN_CHANGE) ]; then \
-	   git fetch $(BGPVPN_REPO) $(BGPVPN_CHANGE); \
-	   git checkout FETCH_HEAD; \
-	fi
-	fpb --debug --build fuel-plugin-bgpvpn/
-	mv fuel-plugin-bgpvpn/bgpvpn*.rpm .
-	$(REPOINFO) -r . > gitinfo_bgpvpnplugin.txt
-	rm -rf fuel-plugin-bgpvpn
-	touch .bgpvpnbuild
-	# 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 $(BGPVPN_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	@if [ ! -z $(BGPVPN_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_BRANCH) > .cachedata; \
-	fi
-	sha1sum Makefile >> .cachedata
-	sha1sum config.mk >> .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 - .bgpvpnbuild bgpvpn*.rpm gitinfo_bgpvpnplugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
deleted file mode 100644
index cd005e82f..000000000
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-BGPVPN_BRANCH?=master
-BGPVPN_REPO?="https://github.com/openstack/fuel-plugin-bgpvpn.git"
-BGPVPN_CHANGE?=cdf0ee0f60e417f37810d6c0074cd1eed4701bf5
diff --git a/build/f_isoroot/f_bootstrap/Makefile b/build/f_isoroot/f_bootstrap/Makefile
deleted file mode 100644
index 1c08405ab..000000000
--- a/build/f_isoroot/f_bootstrap/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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)
-
-.PHONY: all
-all:
-	@mkdir -p release/opnfv/bootstrap/pre.d
-	@mkdir -p release/opnfv/bootstrap/post.d
-	@mkdir -p release/usr/local/sbin
-	@cp pre-scripts/* release/opnfv/bootstrap/pre.d
-	@cp post-scripts/* release/opnfv/bootstrap/post.d
-
-.PHONY: clean
-clean:
-	@rm -rf release
-
-.PHONY: release
-release:all
-	@cp -Rvp release/* ../release
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#############################################################################
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache: clean
-	@echo "clean-cache not implemented"
-
-# Try to download cache - called prior to ordinary build
-.PHONY: get-cache
-get-cache:
-	@echo "get-cache not implemented"
-
-# Store cache if not already stored - called after ordinary build
-.PHONY: put-cache
-put-cache:
-	@echo "put-cache not implemented"
diff --git a/build/f_isoroot/f_bootstrap/README b/build/f_isoroot/f_bootstrap/README
deleted file mode 100644
index 5da954ca4..000000000
--- a/build/f_isoroot/f_bootstrap/README
+++ /dev/null
@@ -1,24 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-This function modifies the adds hooks to the beginning and end of
-/usr/local/sbin/bootstrap_admin_nodes.sh, which is run as the
-last post step from ks.cfg
-
-This enables other functions to place scripts into two directories
-run either at the beginning or the end of the bootstrap procedure:
-
-	/opt/opnfv/bootstrap/pre.d
-	/opt/opnfv/bootstrap/post.d
-
-These will be run in lexical order at pre or post.
-
-CI note: Using pre.d, it would be possible to "inject" a pre-defined
-astute.yaml for Fuel.
diff --git a/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh b/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh
deleted file mode 100755
index 4dfeca58e..000000000
--- a/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#/bin/sh
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-date
-echo "This is an example file run at post-bootstrap."
-exit 0
diff --git a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh
deleted file mode 100755
index 431577cba..000000000
--- a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#/bin/sh
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-echo "Installing pre-build repo"
-if [ ! -d /opt/opnfv/nailgun ]; then
-  echo "Error - found no repo!"
-  exit 1
-fi
-
-mkdir -p /var/www/nailgun
-mv /opt/opnfv/nailgun/* /var/www/nailgun
-if [ $? -ne 0 ]; then
-  echo "Error moving repos to their correct location!"
-  exit 1
-fi
-rmdir /opt/opnfv/nailgun
-if [ $? -ne 0 ]; then
-  echo "Error removing /opt/opnfv/nailgun directory!"
-  exit 1
-fi
-echo "Done installing pre-build repo"
diff --git a/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh b/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh
deleted file mode 100755
index 3eaffa523..000000000
--- a/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#/bin/sh
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-date
-echo "This is an example file run at pre-bootstrap."
-exit 0
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
deleted file mode 100644
index bb4b19cc8..000000000
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# ruijing.guo@intel.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: .barometer
-
-.PHONY: clean
-clean:
-	@rm -f .barometer ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm fuel-plugin-collectd-ceilometer-*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_collectd-ceilometer-plugin.txt gitinfo_collectd-ceilometer-plugin.txt
-
-.PHONY: release
-release:.barometer
-	@rm -f ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm
-	@mkdir -p ../release/opnfv
-	@cp fuel-plugin-collectd-ceilometer*.rpm ../release/opnfv/
-	cp gitinfo_collectd-ceilometer-plugin.txt $(BUILD_BASE)
-
-.barometer:
-	@rm -rf barometer
-	../../docker/ubuntu-builder/install_docker.sh
-	git clone $(COLLECTD_CEILOMETER_REPO)
-	cd barometer; \
-	git checkout $(COLLECTD_CEILOMETER_BRANCH); \
-	if [ ! -z $(COLLECTD_CEILOMETER_CHANGE) ]; then \
-	   git fetch $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_CHANGE); \
-	   git checkout FETCH_HEAD; \
-	fi
-	fpb --debug --build barometer/src/fuel-plugin
-	@mv barometer/src/fuel-plugin/fuel-plugin-collectd-ceilometer*.rpm .
-	$(REPOINFO) -r . > gitinfo_collectd-ceilometer-plugin.txt
-	@rm -rf barometer
-	@touch .barometer
-	# 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 $(COLLECTD_CEILOMETER_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	@if [ ! -z $(COLLECTD_CEILOMETER_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_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 - .barometer fuel-plugin-collectd-ceilometer*.rpm gitinfo_collectd-ceilometer-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
deleted file mode 100644
index 334905f02..000000000
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# ruijing.guo@intel.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
-##############################################################################
-
-COLLECTD_CEILOMETER_BRANCH?=stable/danube
-COLLECTD_CEILOMETER_REPO?=http://gerrit.opnfv.org/gerrit/barometer
-COLLECTD_CEILOMETER_CHANGE?=5649793d2037d6f26211be4035e28842ebb3e737
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
deleted file mode 100644
index 1ba7201f4..000000000
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 OPNFV.
-# 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
-##############################################################################
-packages:
-   - "collectd"
diff --git a/build/f_isoroot/f_congress-pluginbuild/Makefile b/build/f_isoroot/f_congress-pluginbuild/Makefile
deleted file mode 100644
index 51167acd9..000000000
--- a/build/f_isoroot/f_congress-pluginbuild/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Mirantis Inc and others.
-# fzhadaev@mirantis.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: .congressbuild
-
-.PHONY: clean
-clean:
-	@rm -f .congressbuild ../release/opnfv/congress*.rpm congress*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_congressplugin.txt gitinfo_congressplugin.txt
-
-.PHONY: release
-release:.congressbuild
-	@rm -f ../release/opnfv/congress*.rpm
-	@mkdir -p ../release/congress
-	@cp congress*.rpm ../release/opnfv/
-	cp gitinfo_congressplugin.txt $(BUILD_BASE)
-
-.congressbuild:
-	rm -rf fuel-plugin-congress
-	git clone $(CONGRESS_REPO)
-	cd fuel-plugin-congress; \
-	git checkout $(CONGRESS_BRANCH); \
-	if [ ! -z $(CONGRESS_CHANGE) ]; then \
-	   git fetch $(CONGRESS_REPO) $(CONGRESS_CHANGE); \
-	   git checkout FETCH_HEAD; \
-	fi
-	fpb --debug --build fuel-plugin-congress/
-	@mv fuel-plugin-congress/congress*.rpm .
-	$(REPOINFO) -r . > gitinfo_congressplugin.txt
-	@rm -rf fuel-plugin-congress
-	@touch .congressbuild
-	# 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 $(CONGRESS_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	@if [ ! -z $(CONGRESS_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(CONGRESS_REPO) $(CONGRESS_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(CONGRESS_REPO) $(CONGRESS_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 - .congressbuild congress*.rpm gitinfo_congressplugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_congress-pluginbuild/config.mk b/build/f_isoroot/f_congress-pluginbuild/config.mk
deleted file mode 100644
index 5c241a127..000000000
--- a/build/f_isoroot/f_congress-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Mirantis Inc and others.
-# fzhadaev@mirantis.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
-##############################################################################
-
-CONGRESS_BRANCH?=master
-CONGRESS_REPO?="https://github.com/openstack/fuel-plugin-congress"
-CONGRESS_CHANGE?=adfa2db62988649219d64bd53746f2635d95aa43
diff --git a/build/f_isoroot/f_isolinux/Makefile b/build/f_isoroot/f_isolinux/Makefile
deleted file mode 100644
index f3e09b234..000000000
--- a/build/f_isoroot/f_isolinux/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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)
-
-.PHONY: all
-all: isolinux.cfg.iso
-	@mkdir -p release/isolinux
-	grep -q OpenStack_Fuel isolinux.cfg.iso
-	sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" isolinux.cfg.iso > isolinux.cfg
-	@cp isolinux.cfg release/isolinux/isolinux.cfg
-	@cp isolinux.cfg.iso release/isolinux/isolinux.cfg.orig
-
-isolinux.cfg.iso:
-	7z -so x $(ISOCACHE) isolinux/isolinux.cfg > isolinux.cfg.iso
-
-.PHONY: clean
-clean:
-	@rm -rf release isolinux.cfg.iso isolinux.cfg
-
-.PHONY: release
-release: all
-	@cp -Rvp release/* ../release
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#############################################################################
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache: clean
-	@echo "clean-cache not implemented"
-
-# Try to download cache - called prior to ordinary build
-.PHONY: get-cache
-get-cache:
-	@echo "get-cache not implemented"
-
-# Store cache if not already stored - called after ordinary build
-.PHONY: put-cache
-put-cache:
-	@echo "put-cache not implemented"
diff --git a/build/f_isoroot/f_kscfg/Makefile b/build/f_isoroot/f_kscfg/Makefile
deleted file mode 100644
index cfd433f8d..000000000
--- a/build/f_isoroot/f_kscfg/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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)
-
-.PHONY: all
-all:	ks.cfg.iso
-	@mkdir -p release
-	grep -q OpenStack_Fuel ks.cfg.iso
-	sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" ks.cfg.iso > ks.cfg
-	/usr/bin/patch -p0 < ks.cfg.patch
-	@cp ks.cfg.iso release/ks.cfg.orig
-	@cp ks.cfg release/ks.cfg
-
-ks.cfg.iso:
-	7z -so x $(ISOCACHE) ks.cfg > ks.cfg.iso
-
-.PHONY: clean
-clean:
-	@rm -rf release ks.cfg.iso ks.cfg
-
-.PHONY: release
-release: all
-	@cp -Rvp release/* ../release
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#############################################################################
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache: clean
-	@echo "clean-cache not implemented"
-
-# Try to download cache - called prior to ordinary build
-.PHONY: get-cache
-get-cache:
-	@echo "get-cache not implemented"
-
-# Store cache if not already stored - called after ordinary build
-.PHONY: put-cache
-put-cache:
-	@echo "put-cache not implemented"
diff --git a/build/f_isoroot/f_kscfg/README b/build/f_isoroot/f_kscfg/README
deleted file mode 100644
index c85efde77..000000000
--- a/build/f_isoroot/f_kscfg/README
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-This function modifies the ks.cfg of the Fuel master to
-make copy whatever is in the top level opnfv directory
-of the ISO (populated by, for example, f_configfrontend) to
-/opt/opnfv. In the end this is where the installation
-parts will evolve.
-
-This is also the place to force the installation to overwrite
-the disk (set forceformat="yes" instead of "no").
diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch
deleted file mode 100644
index a6840e479..000000000
--- a/build/f_isoroot/f_kscfg/ks.cfg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-*** /dev/null	2016-04-26 10:10:11.481587709 +0200
---- ks.cfg	2016-04-26 10:10:11.481587709 +0200
-***************
-*** 579,584 ****
---- 579,592 ----
-  
-  EOF
-  
-+ ######### OPNFV addition BEGIN ############
-+ # Copy data into /opt/opnfv
-+ # TODO: This ought to be a package instead!
-+ mkdir -p /opt/opnfv
-+ cp -r ${SOURCE}/opnfv /opt
-+ cp ${SOURCE}/gitinfo.txt /
-+ ######### OPNFV addition END ############
-+ 
-  # Unmounting source
-  umount -f ${SOURCE}
-  rm -rf ${SOURCE}
-***************
-*** 647,650 ****
-      /etc/sysconfig/network-scripts/ifcfg-${ifname%%:*} > \
-      /mnt/sysimage/etc/sysconfig/network-scripts/ifcfg-${adminif}
-  fi
-! %end
-\ No newline at end of file
---- 655,658 ----
-      /etc/sysconfig/network-scripts/ifcfg-${ifname%%:*} > \
-      /mnt/sysimage/etc/sysconfig/network-scripts/ifcfg-${adminif}
-  fi
-! %end
diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
deleted file mode 100644
index 81309ef87..000000000
--- a/build/f_isoroot/f_kvm-pluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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: .kvmbuild
-
-.PHONY: clean
-clean:
-	@rm -f .kvmbuild ../release/opnfv/fuel-plugin-kvm*.rpm fuel-plugin-kvm*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_kvm-plugin.txt gitinfo_kvm-plugin.txt
-
-.PHONY: release
-release:.kvmbuild
-	@rm -f ../release/opnfv/fuel-plugin-kvm*.rpm
-	@mkdir -p ../release/opnfv
-	@cp fuel-plugin-kvm*.rpm ../release/opnfv/
-	cp gitinfo_kvm-plugin.txt $(BUILD_BASE)
-
-.kvmbuild:
-	@rm -rf kvmfornfv
-	../../docker/ubuntu-builder/install_docker.sh
-	git clone $(KVMFORNFV_REPO)
-	cd kvmfornfv; \
-	git checkout $(KVMFORNFV_BRANCH); \
-	if [ ! -z $(KVMFORNFV_CHANGE) ]; then \
-	   git fetch $(KVMFORNFV_REPO) $(KVMFORNFV_CHANGE); \
-	   git checkout FETCH_HEAD; \
-	fi
-	cd kvmfornfv/fuel-plugin; \
-	INCLUDE_DEPENDENCIES=true fpb --debug --build ./
-	@mv kvmfornfv/fuel-plugin/fuel-plugin-kvm*.rpm .
-	$(REPOINFO) -r . > gitinfo_kvm-plugin.txt
-	@rm -rf kvmfornfv
-	@touch .kvmbuild
-	# 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 $(KVMFORNFV_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	@if [ ! -z $(KVMFORNFV_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(KVMFORNFV_REPO) $(KVMFORNFV_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(KVMFORNFV_REPO) $(KVMFORNFV_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 - .kvmbuild fuel-plugin-kvm*.rpm gitinfo_kvm-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
deleted file mode 100644
index 19693df25..000000000
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-KVMFORNFV_BRANCH?=master
-KVMFORNFV_REPO?=https://gerrit.opnfv.org/gerrit/kvmfornfv
-KVMFORNFV_CHANGE?=b6b08d2a80b2df28e496ce87705593ed59b282a3
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
deleted file mode 100644
index c0ebba4d7..000000000
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# mskalski@mirantis.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)
-
-include config.mk
-
-.PHONY: all
-all: .odlbuild
-
-.PHONY: clean
-clean:
-	@rm -f .odlbuild ../release/opnfv/opendaylight*.rpm opendaylight*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_odlplugin.txt gitinfo_odlplugin.txt
-	@rm -rf fuel-plugins
-
-.PHONY: release
-release:.odlbuild
-	@rm -f ../release/opnfv/opendaylight*.rpm
-	@mkdir -p ../release/opnfv
-	@cp opendaylight*.rpm ../release/opnfv/
-	cp gitinfo_odlplugin.txt $(BUILD_BASE)
-.odlbuild:
-	rm -rf fuel-plugin-opendaylight
-	../../docker/ubuntu-builder/install_docker.sh
-	git clone -b $(FUEL_PLUGIN_ODL_BRANCH) $(FUEL_PLUGIN_ODL_REPO)
-	cd fuel-plugin-opendaylight; \
-	if [ -n $(FUEL_PLUGIN_ODL_CHANGE) ]; then \
-	   git checkout $(FUEL_PLUGIN_ODL_CHANGE); \
-	fi
-	fpb --debug --build fuel-plugin-opendaylight/
-	mv fuel-plugin-opendaylight/opendaylight*.rpm .
-	$(REPOINFO) -r . > gitinfo_odlplugin.txt
-	rm -rf fuel-plugin-opendaylight
-	touch .odlbuild
-	# 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 $(FUEL_PLUGIN_ODL_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	if [ -n $(FUEL_PLUGIN_ODL_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(FUEL_PLUGIN_ODL_REPO) $(FUEL_PLUGIN_ODL_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(FUEL_PLUGIN_ODL_REPO) $(FUEL_PLUGIN_ODL_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 - .odlbuild opendaylight*.rpm gitinfo_odlplugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
deleted file mode 100644
index 6d176fb75..000000000
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-FUEL_PLUGIN_ODL_BRANCH ?= master
-FUEL_PLUGIN_ODL_CHANGE ?= 32b7edbde866b6a4c1c61e674ddf01a93dd010a2 
-FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
-
-export OPNFV_BUILD?=true
-export ODL_VERSIONS?=5.0.0.1 5.2.0.1
diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
deleted file mode 100644
index 02ba02951..000000000
--- a/build/f_isoroot/f_onosfwpluginbuild/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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: .onosbuild
-
-.PHONY: clean
-clean:
-	@rm -f .onosbuild ../release/opnfv/onos*.rpm onos*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_onos-plugin.txt gitinfo_onos-plugin.txt
-
-.PHONY: release
-release:.onosbuild
-	@rm -f ../release/opnfv/onos*.rpm
-	@mkdir -p ../release/opnfv
-	@cp onos*.rpm ../release/opnfv/
-	cp gitinfo_onos-plugin.txt $(BUILD_BASE)
-
-.onosbuild:
-	@rm -rf fuel-plugin-onos
-	git clone $(ONOS_REPO)
-	cd fuel-plugin-onos; \
-	git checkout $(ONOS_BRANCH); \
-	if [ ! -z $(ONOS_CHANGE) ]; then \
-	   git fetch $(ONOS_REPO) $(ONOS_CHANGE); \
-	   git checkout FETCH_HEAD; \
-	fi
-	INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-onos/
-	@mv fuel-plugin-onos/onos*.rpm .
-	$(REPOINFO) -r . > gitinfo_onos-plugin.txt
-	@rm -rf fuel-plugin-onos
-	@touch .onosbuild
-	# 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 $(ONOS_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	@if [ ! -z $(ONOS_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(ONOS_REPO) $(ONOS_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(ONOS_REPO) $(ONOS_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 - .onosbuild onos*.rpm gitinfo_onos-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_onosfwpluginbuild/config.mk b/build/f_isoroot/f_onosfwpluginbuild/config.mk
deleted file mode 100644
index 5f47804cd..000000000
--- a/build/f_isoroot/f_onosfwpluginbuild/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-ONOS_BRANCH=master
-ONOS_REPO=git://git.openstack.org/openstack/fuel-plugin-onos
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
deleted file mode 100644
index 2d0d202af..000000000
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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: .ovsbuild
-
-.PHONY: clean
-clean:
-	@rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs-*.rpm fuel-plugin-ovs-*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_ovs-nsh-dpdk-plugin.txt gitinfo_ovs-nsh-dpdk-plugin.txt
-
-.PHONY: release
-release:.ovsbuild
-	@rm -f ../release/opnfv/fuel-plugin-ovs-*.rpm
-	@mkdir -p ../release/opnfv
-	@cp fuel-plugin-ovs*.rpm ../release/opnfv/
-	cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
-
-.ovsbuild:
-	@rm -rf fuel-plugin-ovs
-	../../docker/ubuntu-builder/install_docker.sh
-	git clone $(OVS_NSH_DPDK_REPO)
-	cd fuel-plugin-ovs; \
-	git checkout $(OVS_NSH_DPDK_BRANCH); \
-	if [ ! -z $(OVS_NSH_DPDK_CHANGE) ]; then \
-	   git fetch $(OVS_NSH_DPDK_REPO) $(OVS_NSH_DPDK_CHANGE); \
-	   git checkout FETCH_HEAD; \
-	fi
-	INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-ovs/
-	@mv fuel-plugin-ovs/fuel-plugin-ovs*.rpm .
-	$(REPOINFO) -r . > gitinfo_ovs-nsh-dpdk-plugin.txt
-	@rm -rf fuel-plugin-ovs
-	@touch .ovsbuild
-	# 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 $(OVS_NSH_DPDK_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	@if [ ! -z $(OVS_NSH_DPDK_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(OVS_NSH_DPDK_REPO) $(OVS_NSH_DPDK_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(OVS_NSH_DPDK_REPO) $(OVS_NSH_DPDK_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 - .ovsbuild fuel-plugin-ovs*.rpm gitinfo_ovs-nsh-dpdk-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
deleted file mode 100644
index 9de705aae..000000000
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-OVS_NSH_DPDK_BRANCH?=stable/10.0
-OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
-OVS_NSH_DPDK_CHANGE?=a77ce892047fe1ca257bd199d0abf2d2a046c8a3
diff --git a/build/f_isoroot/f_repobuild/.gitignore b/build/f_isoroot/f_repobuild/.gitignore
deleted file mode 100644
index 09baca85d..000000000
--- a/build/f_isoroot/f_repobuild/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-packetary
-fuel-web
-nailgun
-opnfv_config
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
deleted file mode 100644
index c61d1adf5..000000000
--- a/build/f_isoroot/f_repobuild/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-##############################################################################
-# Copyright (c) 2015,2016 Ericsson AB, Enea AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# Alexandru.Avadanii@enea.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
-##############################################################################
-
-SHELL := /bin/bash
-TOP := $(shell pwd)
-
-include ../../config.mk
-include config.mk
-
-export MOS_VERSION
-export MIRROR_UBUNTU_OPNFV_PATH:=$(TOP)/nailgun/mirrors/ubuntu
-
-.PHONY: all
-all: nailgun
-
-nailgun:
-	sudo apt-get install -y createrepo git libxml2-dev libxslt1-dev \
-		python-dev zlib1g-dev
-	rm -Rf nailgun packetary opnfv_config && mkdir opnfv_config
-	# We will analyze fuel-web's fixture files for package lists
-	ln -sf ${F_SUBMOD_DIR}/fuel-web fuel-web
-	# Same for fuel-agent's bootstrap package list
-	ln -sf ${F_SUBMOD_DIR}/fuel-agent fuel-agent
-	git clone --quiet $(PACKETARY_REPO)
-	if [ -n $(PACKETARY_COMMIT) ]; then \
-		git -C packetary checkout $(PACKETARY_COMMIT); \
-	fi
-	sudo pip install -U -r ./packetary/requirements.txt
-	sudo pip install -U ./packetary
-	# Handle config and mirror build in one place
-	./opnfv_mirror_ubuntu.py
-	# 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: clean
-clean:
-	@rm -rf ../release/opnfv/nailgun nailgun packetary fuel-web opnfv_config
-
-.PHONY: release
-release:nailgun
-	@rm -Rf ../release/opnfv/nailgun
-	@mkdir -p ../release/opnfv
-	@cp -Rp nailgun ../release/opnfv/nailgun
-
-############################################################################
-# Cache operations - only used when building through ci/build.sh
-############################################################################
-
-# Create a unique hash to be used for getting and putting cache, based on:
-#   - Year and week (causing the cache to be rebuilt weekly)
-#   - The contents of this Makefile + all sh,mk,py,yaml files in CWD
-#   - repo packages fingerprint
-#   - repo arch list
-.cacheid:
-	date +"Repocache %G%V" > .cachedata
-	sha1sum Makefile *.{sh,mk,py,yaml} >> .cachedata
-	$(CACHETOOL) packages >> .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 - nailgun | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_repobuild/config.mk b/build/f_isoroot/f_repobuild/config.mk
deleted file mode 100644
index 68101d6ec..000000000
--- a/build/f_isoroot/f_repobuild/config.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Ericsson AB, Enea AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# Alexandru.Avadanii@enea.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
-##############################################################################
-
-# Use a recent master commit, since tags/branches are not yet mature
-export PACKETARY_REPO?=https://github.com/openstack/packetary
-export PACKETARY_COMMIT?=c3c2069e2ec46b35eb342386efbf366bb6340027
-
-# arm64 Ubuntu mirror is separated from archive.ubuntu.com
-export MIRROR_UBUNTU_URL_arm64=http://ports.ubuntu.com/ubuntu-ports/
-export MIRROR_UBUNTU_ROOT_arm64=ubuntu-ports
-
-# Merge all local mirror repo components/section into single "main"
-# NOTE: When changing this, make sure to also update all consumer config, like:
-# - fuel-menu/fuelmenu/settings.yaml
-export MIRROR_UBUNTU_MERGE=true
diff --git a/build/f_isoroot/f_repobuild/opnfv_config.yaml b/build/f_isoroot/f_repobuild/opnfv_config.yaml
deleted file mode 100644
index bf3913cc4..000000000
--- a/build/f_isoroot/f_repobuild/opnfv_config.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Enea AB and others.
-# Alexandru.Avadanii@enea.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
-##############################################################################
-
-# REPO definitions
-
-# Based on old fuel-mirror data [1], adapted for OPNFV and packetary.
-# NOTE: 'uri' field will be added by opnfv_mirror_ubuntu.py from ENV.
-# [1] https://github.com/openstack/fuel-mirror/blob/stable/mitaka/
-#     contrib/fuel_mirror/data/ubuntu.yaml
-
-# Main is a required parameter which defines what repository will be used
-# for images creation and that mirror should contain all packages for minimal
-# system creation.
-groups:
-  ubuntu:
-    - name: "ubuntu"
-      main: true
-      suite: "xenial"
-      section:
-        - "main"
-        - "multiverse"
-        - "restricted"
-        - "universe"
-      type: "deb"
-      priority: null
-
-    - name: "ubuntu-updates"
-      suite: "xenial-updates"
-      section:
-        - "main"
-        - "multiverse"
-        - "restricted"
-        - "universe"
-      type: "deb"
-      priority: null
-
-    - name: "ubuntu-security"
-      suite: "xenial-security"
-      section:
-        - "main"
-        - "multiverse"
-        - "restricted"
-        - "universe"
-      type: "deb"
-      priority: null
-
-  mos:
-    - name: "mos"
-      suite: "mos$mos_version"
-      section:
-        - "main"
-        - "restricted"
-      type: "deb"
-      priority: 1000
-
-    - name: "mos-updates"
-      suite: "mos$mos_version-updates"
-      section:
-        - "main"
-        - "restricted"
-      type: "deb"
-      priority: 1000
-
-    - name: "mos-security"
-      suite: "mos$mos_version-security"
-      section:
-        - "main"
-        - "restricted"
-      type: "deb"
-      priority: 1000
-
-    - name: "mos-holdback"
-      suite: "mos$mos_version-holdback"
-      section:
-        - "main"
-        - "restricted"
-      type: "deb"
-      priority: 1000
-
-# PACKAGES
-
-# This section lists packages that should be present in the local Ubuntu mirror,
-# but are not direct dependencies of any other packages from  MOS or Ubuntu.
-# e.g.: additional kernels, bootloaders etc.
-
-packages:
-  - name: "vgabios"
-# Packages are required to build bootstrap images for a system.
-# The mirror should contiain such packages in addition to local mirror.
-  - name: "acpi-support"
-  - name: "anacron"
-  - name: "aptitude"
-  - name: "atop"
-  - name: "acct"
-  - name: "bash-completion"
-  - name: "bc"
-  - name: "build-essential"
-  - name: "ceph"
-  - name: "cloud-init"
-  - name: "conntrackd"
-  - name: "cpu-checker"
-  - name: "cpufrequtils"
-  - name: "debconf-utils"
-  - name: "devscripts"
-  - name: "fping"
-  - name: "galera-3"
-  - name: "git"
-  - name: "grub-pc"
-  - name: "htop"
-  - name: "hwloc"
-  - name: "ifenslave"
-  - name: "iperf"
-  - name: "iptables-persistent"
-  - name: "irqbalance"
-  - name: "language-pack-en"
-  - name: "libapache2-mod-fastcgi"
-  - name: "libnss3-tools"
-  - name: "linux-headers-generic-lts-xenial"
-  - name: "linux-image-generic-lts-xenial"
-  - name: "live-boot"
-  - name: "livecd-rootfs"
-  - name: "mc"
-  - name: "memcached"
-  - name: "mongodb-server"
-  - name: "monit"
-  - name: "msmtp-mta"
-  - name: "multipath-tools"
-  - name: "multipath-tools-boot"
-  - name: "nginx"
-  - name: "ntp"
-  - name: "openssh-server"
-  - name: "pcs"
-  - name: "percona-toolkit"
-  - name: "percona-xtrabackup"
-  - name: "pm-utils"
-  - name: "postfix"
-  - name: "puppet"
-  - name: "python-lesscpy"
-  - name: "python-mysqldb"
-  - name: "python-pip"
-  - name: "radosgw"
-  - name: "rbd-fuse"
-  - name: "rsyslog-gnutls"
-  - name: "rsyslog-relp"
-  - name: "screen"
-  - name: "squashfs-tools"
-  - name: "swift-plugin-s3"
-  - name: "sysfsutils"
-  - name: "sysstat"
-  - name: "telnet"
-  - name: "tmux"
-  - name: "traceroute"
-  - name: "ubuntu-standard"
-  - name: "vim"
-  - name: "virt-what"
-  - name: "xinetd"
-  - name: "xmlstarlet"
-  - name: "tftpd-hpa"
-  - name: "syslinux"
-
-# OPNFV BLACKLIST
-
-# Packetary's dependency solving mechanism brings in more than one alternative
-# For example, "Depends: upstart | systemd-sysv" brings both packages, which
-# leads to debootstrap using "upstart" (1st option available in local repo).
-
-opnfv_blacklist:
-  - name: "upstart"
diff --git a/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py b/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py
deleted file mode 100755
index 7c383639e..000000000
--- a/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py
+++ /dev/null
@@ -1,280 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-# Copyright (c) 2015,2016 Ericsson AB, Mirantis Inc., Enea AB and others.
-# mskalski@mirantis.com
-# Alexandru.Avadanii@enea.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
-##############################################################################
-
-"""Build multiarch partial local Ubuntu mirror using packetary"""
-
-##############################################################################
-# Design quirks / workarounds:
-# 1. Fuel-agent uses `debootstrap` to build bootstrap and target chroots from
-#    the local mirror; which only uses the "main" component from the first
-#    repository, i.e. does not include "updates"/"security".
-#    In order to fullfill all debootstrap dependencies in "main" repo, we will
-#    do an extra packetary run using a reduced scope:
-#    - only "main" component of the first mirror;
-#    - reduced package dependency list (without MOS/OPNFV plugin deps).
-# 2. If repo structure is not mandatory to be in sync with official mirrors,
-#    we can mitigate the issue by "merging" all repo-components into a single
-#    "main".
-##############################################################################
-# Mirror build steps (for EACH architecture in UBUNTU_ARCH):
-# 1. Collect bootstrap package deps from fuel-agent's <settings.yaml.sample>;
-# 2. Collect all fixture release packages from fuel-web's <openstack.yaml>;
-# 3. Parse new "opnfv_config.yaml" list of packages (from old fuel-mirror);
-# 4. Inherit enviroment variable(s) for mirror URLs, paths etc.
-#    - Allow arch-specific overrides for each env var;
-# 5. Mirror config is defined based on common config + OPNFV overrides;
-#    - Convert old configuration format to packetary style where needed;
-# 6. Package lists are defined based on common config + OPNFV deps;
-#    - Keep track of "main" packages separately, required by debootstrap;
-# 7. Clone/update all mirror components;
-# 8. IF mirror merging is disabled:
-#    - Clone/update "main" mirror component (fix missing debootstrap deps);
-# 9. IF mirror merging is enabled:
-#    - Use `dpkg-scanpackages` to filter out old versions of duplicate pkgs;
-#    - Run `packetary create` on the set of downloaded packages, merging
-#      them on the fly into a single-component mirror;
-##############################################################################
-
-from copy import deepcopy
-import os
-import shutil
-import sys
-import yaml
-from contextlib import contextmanager
-from cStringIO import StringIO
-from packetary.cli.app import main
-
-@contextmanager
-def capture_stdout(output):
-    """Context manager for capturing stdout"""
-    stdout = sys.stdout
-    sys.stdout = output
-    yield
-    sys.stdout = stdout
-
-# FIXME: Find a better approach for eliminating duplicate logs than this
-def force_logger_reload():
-    """Force logger reload (ugly hack to prevent log duplication)"""
-    for mod in sys.modules.keys():
-        if mod.startswith('logging'):
-            try:
-                reload(sys.modules[mod])
-            except:
-                pass
-
-def get_unres_pkgs(architecture, cfg_mirror):
-    """Determine missing package dependecies for a mirror defition"""
-    unresolved_pkgs = list()
-    packetary_output = StringIO()
-    with capture_stdout(packetary_output):
-        main('unresolved -a {0} -r {1} -c name version --sep ;'
-            .format(_ARCH[architecture], cfg_mirror).split(' '))
-    for dep_pkg in packetary_output.getvalue().splitlines():
-        if dep_pkg.startswith('#'):
-            continue
-        dep = dep_pkg.split(';')
-        unresolved_pkgs += [{'name': dep[0], 'version': dep[1]}]
-    force_logger_reload()
-    return unresolved_pkgs
-
-def from_legacy_pkglist(legacy_pkglist):
-    """Package list conversion from `old fuel-mirror` to `packetary` style"""
-    pkglist = list()
-    for pkg in legacy_pkglist:
-        pkglist += [{'name': pkg}]
-    return pkglist
-
-def to_legacy_pkglist(pkglist):
-    """Package list conversion from `packetary` style to `old fuel-mirror`"""
-    legacy_pkglist = list()
-    for pkg in pkglist:
-        legacy_pkglist.append(pkg['name'])
-    return legacy_pkglist
-
-def legacy_diff(base_pkglist, new_pkglist, requester, architecture):
-    """Package list diff (old format)"""
-    diff_set = set(new_pkglist)
-    if base_pkglist:
-        diff_set -= set(base_pkglist)
-    if diff_set:
-        print(' * {0} requires new packages for architecture [{1}]: {2}'
-              .format(requester, architecture, ', '.join(diff_set)))
-    return list(diff_set)
-
-def do_local_repo(architecture, cfg_repo, cfg_packages_paths):
-    """Create single-component local repo (one architecture per call)"""
-    # Packetary does not use a global config file, so pass old settings here.
-    main('create -t deb -a {0} --repository {1} --package-files {2}'
-         ' --ignore-errors-num 2 --retries-num 3 --threads-num 10'
-         .format(_ARCH[architecture], cfg_repo, cfg_packages_paths).split(' '))
-    force_logger_reload()
-
-def do_partial_mirror(architecture, cfg_mirror, cfg_packages):
-    """Clone partial local mirror (one architecture per call)"""
-    # Note: '-d .' is ignored, as each mirror defines its own path.
-    main('clone -t deb -a {0} -r {1} -R {2} -d .'
-         ' --ignore-errors-num 2 --retries-num 3 --threads-num 10'
-         .format(_ARCH[architecture], cfg_mirror, cfg_packages).split(' '))
-    force_logger_reload()
-
-def write_cfg_file(cfg_mirror, data):
-    """Write configuration (yaml) file (package list / mirror defition)"""
-    with open(cfg_mirror, 'w') as outfile:
-        outfile.write(yaml.safe_dump(data, default_flow_style=False))
-
-def get_env(env_var, architecture=None):
-    """Evaluate architecture-specific overrides of env vars"""
-    if architecture:
-        env_var_arch = '{0}_{1}'.format(env_var, architecture)
-        if os.environ.get(env_var_arch):
-            return os.environ[env_var_arch]
-    if os.environ.get(env_var):
-        return os.environ[env_var]
-    return None
-
-# Architecture name mapping (dpkg:packetary) for packetary CLI invocation
-_ARCH = {
-    "i386": "i386",
-    "amd64": "x86_64",
-    "arm64": "aarch64",
-}
-
-# Arch-indepedent configuration (old fuel-mirror + OPNFV extra packages)
-CFG_D = 'opnfv_config'
-CFG_OPNFV = 'opnfv_config.yaml'
-MOS_VERSION = get_env('MOS_VERSION')
-UBUNTU_ARCH = get_env('UBUNTU_ARCH')
-MIRROR_UBUNTU_PATH = get_env('MIRROR_UBUNTU_OPNFV_PATH')
-MIRROR_UBUNTU_TMP_PATH = '{0}.tmp'.format(MIRROR_UBUNTU_PATH)
-MIRROR_UBUNTU_MERGE = get_env('MIRROR_UBUNTU_MERGE')
-CFG_MM_UBUNTU = '{0}/ubuntu_mirror_local.yaml'.format(CFG_D)
-FUEL_BOOTSTRAP_CLI_FILE = open('fuel-agent/contrib/fuel_bootstrap/'
-    'fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample').read()
-FUEL_BOOTSTRAP_CLI = yaml.load(FUEL_BOOTSTRAP_CLI_FILE)
-FIXTURE_FILE = open('fuel-web/nailgun/nailgun/fixtures/openstack.yaml').read()
-FIXTURE = yaml.load(FIXTURE_FILE)
-OPNFV_CFG_YAML = open(CFG_OPNFV).read()
-OPNFV_CFG = yaml.load(OPNFV_CFG_YAML)
-
-# Create local partial mirror using packetary, one arch at a time
-for arch in UBUNTU_ARCH.split(' '):
-    # Mirror / Package env vars, arch-overrideable
-    mos_ubuntu = get_env('MIRROR_MOS_UBUNTU', arch)
-    mos_ubuntu_root = get_env('MIRROR_MOS_UBUNTU_ROOT', arch)
-    mirror_ubuntu = get_env('MIRROR_UBUNTU_URL', arch)
-    plugins = get_env('BUILD_FUEL_PLUGINS', arch)
-    if plugins is None:
-        plugins = get_env('PLUGINS', arch)
-
-    # Mirror / Package list configuration files (arch-specific)
-    cfg_m_mos = '{0}/mos_{1}_mirror.yaml'.format(CFG_D, arch)
-    cfg_m_ubuntu = '{0}/ubuntu_{1}_mirror.yaml'.format(CFG_D, arch)
-    cfg_p_ubuntu = '{0}/ubuntu_{1}_packages.yaml'.format(CFG_D, arch)
-    cfg_m_ubuntu_main = '{0}/ubuntu_{1}_mirror_main.yaml'.format(CFG_D, arch)
-    cfg_p_ubuntu_main = '{0}/ubuntu_{1}_packages_main.yaml'.format(CFG_D, arch)
-
-    # Mirror config fork before customizing (arch-specific)
-    arch_mos = 'mos_{0}'.format(arch)
-    arch_ubuntu = 'ubuntu_{0}'.format(arch)
-    arch_packages = 'packages_{0}'.format(arch)
-    OPNFV_CFG['groups'][arch_mos] = deepcopy(OPNFV_CFG['groups']['mos'])
-    OPNFV_CFG['groups'][arch_ubuntu] = deepcopy(OPNFV_CFG['groups']['ubuntu'])
-    OPNFV_CFG[arch_packages] = OPNFV_CFG['packages']
-
-    # Mirror config update & conversion to packetary input
-    group_main_ubuntu = dict()
-    for group in OPNFV_CFG['groups'][arch_mos]:
-        group['uri'] = "http://{}{}".format(mos_ubuntu, mos_ubuntu_root)
-        group['suite'] = group['suite'].replace('$mos_version', MOS_VERSION)
-    for group in OPNFV_CFG['groups'][arch_ubuntu]:
-        group['uri'] = mirror_ubuntu
-        # FIXME: At `create`, packetary insists on copying all pkgs to dest dir,
-        # so configure it for another dir, which will replace the orig.
-        group['path'] = MIRROR_UBUNTU_TMP_PATH
-        if not group_main_ubuntu and 'main' in group:
-            group_main_ubuntu = [deepcopy(group)]
-            group_main_ubuntu[0]['section'] = ['main']
-
-    # Mirror config dump: MOS (for dep resolution), Ubuntu, Ubuntu[main]
-    write_cfg_file(cfg_m_mos, OPNFV_CFG['groups'][arch_mos])
-    write_cfg_file(cfg_m_ubuntu, OPNFV_CFG['groups'][arch_ubuntu])
-    if MIRROR_UBUNTU_MERGE is None:
-        write_cfg_file(cfg_m_ubuntu_main, group_main_ubuntu)
-    else:
-        # FIXME: For multiarch, only one dump would be enough
-        group_main_ubuntu[0]['origin'] = 'Ubuntu'
-        group_main_ubuntu[0]['path'] = MIRROR_UBUNTU_PATH
-        group_main_ubuntu[0]['uri'] = MIRROR_UBUNTU_PATH
-        write_cfg_file(CFG_MM_UBUNTU, group_main_ubuntu[0])
-
-    # Collect package dependencies from:
-    ## 1. fuel_bootstrap_cli (bootstrap image additional packages)
-    legacy_unresolved = legacy_diff(None, FUEL_BOOTSTRAP_CLI['packages'] + [
-            FUEL_BOOTSTRAP_CLI['kernel_flavor'],
-            FUEL_BOOTSTRAP_CLI['kernel_flavor'].replace('image', 'headers')],
-        'Bootstrap', arch)
-    ## 2. openstack.yaml FIXTURE definition (default target image packages)
-    for release in FIXTURE:
-        editable = release['fields']['attributes_metadata']['editable']
-        if 'provision' in editable and 'packages' in editable['provision']:
-            release_pkgs = editable['provision']['packages']['value'].split()
-            legacy_unresolved += legacy_diff(legacy_unresolved, release_pkgs,
-                'Release {0}'.format(release['fields']['name']), arch)
-    ## 3. OPNFV additional packages (includes old fuel-mirror ubuntu.yaml pkgs)
-    unresolved = dict()
-    unresolved['mandatory'] = 'exact'
-    unresolved['packages'] = from_legacy_pkglist(legacy_unresolved)
-    if 'packages' in OPNFV_CFG:
-        legacy_diff(legacy_unresolved, to_legacy_pkglist(OPNFV_CFG['packages']),
-            'OPNFV config', arch)
-        unresolved['packages'] += OPNFV_CFG['packages']
-
-    # OPNFV plugins dependency resolution
-    if plugins:
-        for plugin in plugins.split():
-            path = "../{}/packages.yaml".format(plugin)
-            if os.path.isfile(path):
-                f = open(path).read()
-                plugin_yaml = yaml.load(f)
-                new_pkgs = legacy_diff(
-                    to_legacy_pkglist(unresolved['packages']),
-                    plugin_yaml['packages'], 'Plugin {0}'.format(plugin), arch)
-                unresolved['packages'] += from_legacy_pkglist(new_pkgs)
-
-    # Package list (reduced, i.e. no MOS deps, but with OPNFV plugin deps)
-    if MIRROR_UBUNTU_MERGE is None:
-        write_cfg_file(cfg_p_ubuntu_main, unresolved)
-
-    # Mirror package list (full, including MOS/OPNFV plugin deps)
-    unresolved['packages'] += get_unres_pkgs(arch, cfg_m_mos)
-    write_cfg_file(cfg_p_ubuntu, unresolved)
-    do_partial_mirror(arch, cfg_m_ubuntu, cfg_p_ubuntu)
-    if MIRROR_UBUNTU_MERGE is None:
-        # Ubuntu[main] must be evaluated after Ubuntu
-        do_partial_mirror(arch, cfg_m_ubuntu_main, cfg_p_ubuntu_main)
-
-if MIRROR_UBUNTU_MERGE is None:
-    shutil.move(MIRROR_UBUNTU_TMP_PATH, MIRROR_UBUNTU_PATH)
-else:
-    # Construct single-component mirror from all components
-    for arch in UBUNTU_ARCH.split(' '):
-        cfg_pp_ubuntu = '{0}/ubuntu_{1}_packages_paths.yaml'.format(CFG_D, arch)
-        # OPNFV blacklist
-        opnfv_blacklist = to_legacy_pkglist(OPNFV_CFG['opnfv_blacklist'])
-        # FIXME: We need scanpackages to omit older DEBs
-        # Inspired from http://askubuntu.com/questions/198474/
-        os.system('dpkg-scanpackages -a {0} {1} 2>/dev/null | '
-                  'grep -e "^Filename:" | sed "s|Filename: |- file://|g" | '
-                  'grep -v -E "\/({2})_" > {3}'
-                  .format(arch, MIRROR_UBUNTU_TMP_PATH,
-                          '|'.join(opnfv_blacklist), cfg_pp_ubuntu))
-        do_local_repo(arch, CFG_MM_UBUNTU, cfg_pp_ubuntu)
-    shutil.rmtree(MIRROR_UBUNTU_TMP_PATH)
diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
deleted file mode 100755
index c8c86db53..000000000
--- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-
-UBUNTU_DISTRO="xenial"
-BLACKLIST="http://mirrors.se.eu.kernel.org/ubuntu/"
-#BLACKLIST+=" http://foo.bar"
-
-cleanup() {
-    rm -f $TMPFILE
-}
-
-debugmsg() {
-    test -n "$DEBUG" && echo "$@" >&2
-}
-
-
-# Check if url is blacklisted in this script
-blacklisted () {
-  for blackurl in $BLACKLIST
-  do
-    if [ "$1" == "$blackurl" ]; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-
-# Check mirror's integrity
-check_mirror () {
-    mirror=$1
-    status=0
-    for packdir in dists/${UBUNTU_DISTRO}-updates/main/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-updates/restricted/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-updates/universe/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-updates/multiverse/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-security/main/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-security/restricted/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-security/universe/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-security/multiverse/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-proposed/main/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-proposed/restricted/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-proposed/universe/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-proposed/multiverse/binary-amd64 \
-        dists/${UBUNTU_DISTRO}/main/binary-amd64 \
-        dists/${UBUNTU_DISTRO}/restricted/binary-amd64 \
-        dists/${UBUNTU_DISTRO}/universe/binary-amd64 \
-        dists/${UBUNTU_DISTRO}/multiverse/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-backports/main/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-backports/restricted/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-backports/universe/binary-amd64 \
-        dists/${UBUNTU_DISTRO}-backports/multiverse/binary-amd64
-    do
-        for packfile in Release Packages.gz
-        do
-            if [ $status -ne 1 ]; then
-                curl --output /dev/null --silent --head --fail \
-                    $mirror/$packdir/$packfile
-                if [ $? -ne 0 ]; then
-                    debugmsg "$mirror: Faulty (at least missing $packdir/$packfile)"
-                    status=1
-                fi
-            fi
-        done
-    done
-    return $status
-}
-
-if [ "$1" == "-d" ]; then
-    DEBUG=1
-fi
-
-# Hardcode for testing purposes
-# DEBUG=1
-
-TMPFILE=$(mktemp /tmp/mirrorsXXXXX)A
-trap cleanup exit
-
-# Generate a list of mirrors considered as "up"
-curl -s  https://launchpad.net/ubuntu/+archivemirrors | \
-    grep -P -B8 "statusUP|statusONE|statusSIX" | \
-    grep -o -P "(f|ht)tp.*\""  | \
-    sed 's/"$//' | sort | uniq > $TMPFILE
-
-# Iterate over "close" mirror, check that they are considered up
-# and sane.
-for url in $(curl -s http://mirrors.ubuntu.com/mirrors.txt)
-do
-    if ! grep -q $url $TMPFILE; then
-        debugmsg "$url Faulty (detected by Ubuntu)"
-    elif blacklisted $url; then
-        debugmsg "$url blacklisted"
-    elif [ -z $BESTURL ]; then
-        if grep -q $url $TMPFILE && check_mirror $url; then
-            debugmsg "$url: OK (setting as primary URL)"
-            BESTURL=$url
-            test -z "$DEBUG" && break
-        fi
-    else
-        grep -q $url $TMPFILE && check_mirror $url && debugmsg "$url: OK"
-    fi
-done
-
-echo "$BESTURL"
diff --git a/build/f_isoroot/f_tacker-pluginbuild/Makefile b/build/f_isoroot/f_tacker-pluginbuild/Makefile
deleted file mode 100644
index 9c97db777..000000000
--- a/build/f_isoroot/f_tacker-pluginbuild/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-##############################################################################
-# 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
deleted file mode 100644
index 516adc7c1..000000000
--- a/build/f_isoroot/f_tacker-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# 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?=7068a300df0c695fb4589bf504b29cbed970ba58
diff --git a/build/f_isoroot/f_tacker-pluginbuild/packages.yaml b/build/f_isoroot/f_tacker-pluginbuild/packages.yaml
deleted file mode 100644
index c7775d120..000000000
--- a/build/f_isoroot/f_tacker-pluginbuild/packages.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-packages:
-  - python-jsonrpclib
-
diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile
deleted file mode 100644
index 73de611ff..000000000
--- a/build/f_isoroot/f_vsperfpluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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: .vsperfbuild
-
-.PHONY: clean
-clean:
-	@rm -f .vsperfbuild ../release/opnfv/fuel-plugin-vsperf*.rpm fuel-plugin-vsperf*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_vsperf-plugin.txt gitinfo_vsperf-plugin.txt
-
-.PHONY: release
-release:.vsperfbuild
-	@rm -f ../release/opnfv/fuel-plugin-vsperf*.rpm
-	@mkdir -p ../release/opnfv
-	@cp fuel-plugin-vsperf*.rpm ../release/opnfv/
-	cp gitinfo_vsperf-plugin.txt $(BUILD_BASE)
-
-.vsperfbuild:
-	@rm -rf vswitchperf
-	../../docker/ubuntu-builder/install_docker.sh
-	git clone $(VSPERF_REPO) vswitchperf
-	cd vswitchperf; \
-	git checkout $(VSPERF_BRANCH); \
-	if [ ! -z $(VSPERF_CHANGE) ]; then \
-	   git fetch $(VSPERF_REPO) $(VSPERF_CHANGE); \
-	   git checkout FETCH_HEAD; \
-	fi
-	cd vswitchperf; \
-	INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-vsperf/
-	@mv vswitchperf/fuel-plugin-vsperf/fuel-plugin-vsperf*.rpm .
-	$(REPOINFO) -r . > gitinfo_vsperf-plugin.txt
-	@rm -rf fuel-plugin-vsperf
-	@touch .vsperfbuild
-	# 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 $(VSPERF_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	@if [ ! -z $(VSPERF_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(VSPERF_REPO) $(VSPERF_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(VSPERF_REPO) $(VSPERF_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 - .vsperfbuild fuel-plugin-vsperf*.rpm gitinfo_vsperf-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
deleted file mode 100644
index d1db7eb6f..000000000
--- a/build/f_isoroot/f_vsperfpluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-VSPERF_BRANCH?=stable/danube
-VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git
-VSPERF_CHANGE?=5a48d6b78c014e62e7c233117abb61cc1f8844e6
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/Makefile b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
deleted file mode 100644
index 32de3b3f4..000000000
--- a/build/f_isoroot/f_yardstick-pluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# ruijing.guo@intel.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: .yardstickbuild
-
-.PHONY: clean
-clean:
-	@rm -f .yardstickbuild ../release/opnfv/fuel-plugin-yardstick*.rpm fuel-plugin-yardstick*.rpm
-	@rm -f $(BUILD_BASE)/gitinfo_yardstick-plugin.txt gitinfo_yardstick-plugin.txt
-
-.PHONY: release
-release:.yardstickbuild
-	@rm -f ../release/opnfv/fuel-plugin-yardstick*.rpm
-	@mkdir -p ../release/opnfv
-	@cp fuel-plugin-yardstick*.rpm ../release/opnfv/
-	cp gitinfo_yardstick-plugin.txt $(BUILD_BASE)
-
-.yardstickbuild:
-	@rm -rf yardstick
-	git clone $(YARDSTICK_REPO) yardstick
-	cd yardstick; \
-	git checkout $(YARDSTICK_BRANCH); \
-	if [ ! -z $(YARDSTICK_CHANGE) ]; then \
-	   git fetch $(YARDSTICK_REPO) $(YARDSTICK_CHANGE); \
-	   git checkout FETCH_HEAD; \
-	fi
-	cd yardstick; \
-	INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin/
-	@mv yardstick/fuel-plugin/fuel-plugin-yardstick*.rpm .
-	$(REPOINFO) -r . > gitinfo_yardstick-plugin.txt
-	@rm -rf fuel-plugin-yardstick
-	@touch .yardstickbuild
-	# 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 $(YARDSTICK_BRANCH)
-#   - The contents of this Makefile
-.cacheid:
-	@if [ ! -z $(YARDSTICK_CHANGE) ]; then \
-	  $(CACHETOOL) getcommitid $(YARDSTICK_REPO) $(YARDSTICK_CHANGE) > .cachedata; \
-	else \
-	  $(CACHETOOL) getcommitid $(YARDSTICK_REPO) $(YARDSTICK_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 - .yardstickbuild fuel-plugin-yardstick*.rpm gitinfo_yardstick-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
deleted file mode 100644
index 508a10eec..000000000
--- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# ruijing.guo@intel.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
-##############################################################################
-
-YARDSTICK_BRANCH?=stable/danube
-YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git
-YARDSTICK_CHANGE?=7a4472954122ce97cc67acab2dc3207a1582370d
author	Alexandru Avadanii <Alexandru.Avadanii@enea.com>	2017-08-31 02:32:05 +0200
committer	Alexandru Avadanii <Alexandru.Avadanii@enea.com>	2017-09-03 04:27:00 +0200
commit	1b89628e4571a65245a743e4a85d38438a119b3d (patch)
tree	6b31ac6ab1d5e2197cf2e922ae317d8db237e303 /build/f_isoroot
parent	98f171c82636c29a9cfd5c94c8e7aac7ca7af41b (diff)