Integration of fuel-plugin-tacker 81/22681/1
authorGeorge Paraskevopoulos <geopar@intracom-telecom.com>
Fri, 30 Sep 2016 12:21:26 +0000 (15:21 +0300)
committerMichal Skalski <mskalski@mirantis.com>
Tue, 4 Oct 2016 08:45:17 +0000 (08:45 +0000)
JIRA: FUEL-205

This change integrates https://github.com/openstack/fuel-plugin-tacker
to the Fuel project.

Change-Id: I51b1bdeeb678e55b85393f6a9f8180fc79322e8f
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
(cherry picked from commit d91a7fc7cc9d853a9e5c56f87b6cd22ca11ab9a2)

build/f_isoroot/Makefile
build/f_isoroot/f_tacker-pluginbuild/Makefile [new file with mode: 0644]
build/f_isoroot/f_tacker-pluginbuild/config.mk [new file with mode: 0644]
build/f_isoroot/f_tacker-pluginbuild/packages.yaml [new file with mode: 0644]

index 448f415..1539783 100644 (file)
@@ -11,7 +11,7 @@
 # Add Fuel plugin build targets here
 # Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have
 # verified it!
-PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild
+PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild f_tacker-pluginbuild
 #PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
 export PLUGINS
 #NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
diff --git a/build/f_isoroot/f_tacker-pluginbuild/Makefile b/build/f_isoroot/f_tacker-pluginbuild/Makefile
new file mode 100644 (file)
index 0000000..997430d
--- /dev/null
@@ -0,0 +1,91 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# geopar@intracom-telecom.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+TOP := $(shell pwd)
+
+############################################################################
+# BEGIN of Include definitions
+#
+include config.mk
+#
+# END Include definitions
+#############################################################################
+
+
+.PHONY: all
+all: .tackerbuild
+
+.PHONY: clean
+clean:
+       @rm -f .tackerbuild ../release/opnfv/tacker*.rpm tacker*.rpm
+       @rm -f $(BUILD_BASE)/gitinfo_tackerplugin.txt gitinfo_tackerplugin.txt
+
+.PHONY: release
+release:.tackerbuild
+       @rm -f ../release/opnfv/tacker*.rpm
+       @mkdir -p ../release/tacker
+       @cp tacker*.rpm ../release/opnfv/
+       cp gitinfo_tackerplugin.txt $(BUILD_BASE)
+
+.tackerbuild:
+       rm -rf fuel-plugin-tacker
+       git clone $(TACKER_REPO)
+       cd fuel-plugin-tacker; \
+       git checkout $(TACKER_BRANCH); \
+       if [ ! -z $(TACKER_CHANGE) ]; then \
+          git fetch $(TACKER_REPO) $(TACKER_CHANGE); \
+          git checkout FETCH_HEAD; \
+       fi
+       fpb --debug --build fuel-plugin-tacker/
+       @mv fuel-plugin-tacker/tacker*.rpm .
+       $(REPOINFO) -r . > gitinfo_tackerplugin.txt
+       @rm -rf fuel-plugin-tacker
+       @touch .tackerbuild
+       # Store artifact in cache straight away if caching is enabled
+       # (no .cacheid will be present unless this is a cached build)
+       test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
+
+#############################################################################
+# Cache operations - only used when building through ci/build.sh
+#############################################################################
+
+
+# Create a unique hash to be used for getting and putting cache, based on:
+#   - The SHA1 hash of the HEAD on the plugin repo's $(TACKER_BRANCH)
+#   - The contents of this Makefile
+.cacheid:
+       @if [ ! -z $(TACKER_CHANGE) ]; then \
+         $(CACHETOOL) getcommitid $(TACKER_REPO) $(TACKER_CHANGE) > .cachedata; \
+       else \
+         $(CACHETOOL) getcommitid $(TACKER_REPO) $(TACKER_BRANCH) > .cachedata; \
+       fi
+       @sha1sum Makefile | awk {'print $$1'} >> .cachedata
+       @sha1sum config.mk | awk {'print $$1'} >> .cachedata
+       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
+       @cat .cachedata | $(CACHETOOL) getid > .cacheid
+
+# Clean local data related to caching - called prior to ordinary build
+.PHONY: clean-cache
+clean-cache: clean
+       @rm -f .cachedata .cacheid
+
+# Try to download cache - called prior to ordinary build
+.PHONY: get-cache
+get-cache: .cacheid
+       @if $(CACHETOOL) check $(shell cat .cacheid); then \
+                $(CACHETOOL) get $(shell cat .cacheid) | tar xf -;\
+       else \
+               echo "No cache item found for $(shell cat .cacheid)" ;\
+               exit 0;\
+       fi
+
+# Store cache if not already stored - called after ordinary build
+.PHONY: put-cache
+put-cache: .cacheid
+       @tar cf - .tackerbuild tacker*.rpm gitinfo_tackerplugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_tacker-pluginbuild/config.mk b/build/f_isoroot/f_tacker-pluginbuild/config.mk
new file mode 100644 (file)
index 0000000..2de94d5
--- /dev/null
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# geopar@intracom-telecom.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+TACKER_BRANCH?=master
+TACKER_REPO?="https://github.com/openstack/fuel-plugin-tacker"
+TACKER_CHANGE?=e49db23fa2392e2cc42ac15ce22e869ff9cb0e0c
diff --git a/build/f_isoroot/f_tacker-pluginbuild/packages.yaml b/build/f_isoroot/f_tacker-pluginbuild/packages.yaml
new file mode 100644 (file)
index 0000000..c7775d1
--- /dev/null
@@ -0,0 +1,3 @@
+packages:
+  - python-jsonrpclib
+