Merge "build, deploy: Remove obsolete Fuel@Openstack code"

2 files changed, 0 insertions, 101 deletions

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