aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavidjchou <david.j.chou@intel.com>2016-06-24 03:42:47 -0700
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-06-28 11:45:01 +0000
commite8928f93b50df3ecb11942ab754bae848c082c6a (patch)
tree9dfd960a60c3d6fa1489649dddeef429b203c086
parent105fa8c0d40e241c206e37755f13aebb2e137ebd (diff)
Add fuel-plugin-kvm to install kvmfornfv
1. The installer function for kvmfornfv was in fuel-plug-qemu in Brahmaputra release, it will be in this new fuel-plugin-kvm for Colorado release for clarity 2. Deleted f_qemupluginbuild sub-directory 3. Two "# fix me" for "@sudo rm -rf kvmfornfv" instead of "@rm -rf kvmfornfv" in Makefiel are the temp workgrounds for some files generated during kvmfornfv building are owned by "root", will remove these workarounds after resolving this issue in fuel-plugin-kvm build process Change-Id: I8a1e2dfaff692dc9813afb5d3bf038170871cade Signed-off-by: davidjchou <david.j.chou@intel.com>
-rw-r--r--build/f_isoroot/Makefile4
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/Makefile (renamed from build/f_isoroot/f_qemupluginbuild/Makefile)51
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/config.mk (renamed from build/f_isoroot/f_qemupluginbuild/config.mk)6
3 files changed, 32 insertions, 29 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 2a9649048..e80b95e72 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,8 +11,8 @@
# 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
-#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
+PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-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_qemupluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
index 2e3a34f7b..4b68475f2 100644
--- a/build/f_isoroot/f_qemupluginbuild/Makefile
+++ b/build/f_isoroot/f_kvm-pluginbuild/Makefile
@@ -18,37 +18,40 @@ include config.mk
#############################################################################
.PHONY: all
-all: .qemubuild
+all: .kvmbuild
.PHONY: clean
clean:
- @rm -f .qemubuild ../release/opnfv/fuel-plugin-qemu*.rpm fuel-plugin-qemu*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_qemu-plugin.txt gitinfo_qemu-plugin.txt
+ @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:.qemubuild
- @rm -f ../release/opnfv/fuel-plugin-qemu*.rpm
+release:.kvmbuild
+ @rm -f ../release/opnfv/fuel-plugin-kvm*.rpm
@mkdir -p ../release/opnfv
- @cp fuel-plugin-qemu*.rpm ../release/opnfv/
- cp gitinfo_qemu-plugin.txt $(BUILD_BASE)
+ @cp fuel-plugin-kvm*.rpm ../release/opnfv/
+ cp gitinfo_kvm-plugin.txt $(BUILD_BASE)
-.qemubuild:
- @rm -rf fuel-plugin-qemu
+.kvmbuild:
+ # fix me
+ @sudo rm -rf kvmfornfv
sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
sudo pip install fuel-plugin-builder
../../docker/ubuntu-builder/install_docker.sh
- git clone $(QEMU_REPO)
- cd fuel-plugin-qemu; \
- git checkout $(QEMU_BRANCH); \
- if [ ! -z $(QEMU_CHANGE) ]; then \
- git fetch $(QEMU_REPO) $(QEMU_CHANGE); \
+ 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
- INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-qemu/
- @mv fuel-plugin-qemu/fuel-plugin-qemu*.rpm .
- $(REPOINFO) -r . > gitinfo_qemu-plugin.txt
- @rm -rf fuel-plugin-qemu
- @touch .qemubuild
+ cd kvmfornfv/fuel-plugin; \
+ INCLUDE_DEPENDENCIES=true fpb --debug --build ./
+ @mv kvmfornfv/fuel-plugin/fuel-plugin-kvm*.rpm .
+ $(REPOINFO) -r . > gitinfo_kvm-plugin.txt
+ # fix me
+ @sudo 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
@@ -59,13 +62,13 @@ release:.qemubuild
# 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 $(QEMU_BRANCH)
+# - The SHA1 hash of the HEAD on the plugin repo's $(KVMFORNFV_BRANCH)
# - The contents of this Makefile
.cacheid:
- @if [ ! -z $(QEMU_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(QEMU_REPO) $(QEMU_CHANGE) > .cachedata; \
+ @if [ ! -z $(KVMFORNFV_CHANGE) ]; then \
+ $(CACHETOOL) getcommitid $(KVMFORNFV_REPO) $(KVMFORNFV_CHANGE) > .cachedata; \
else \
- $(CACHETOOL) getcommitid $(QEMU_REPO) $(QEMU_BRANCH) > .cachedata; \
+ $(CACHETOOL) getcommitid $(KVMFORNFV_REPO) $(KVMFORNFV_BRANCH) > .cachedata; \
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
@@ -89,4 +92,4 @@ get-cache: .cacheid
# Store cache if not already stored - called after ordinary build
.PHONY: put-cache
put-cache: .cacheid
- @tar cf - .qemubuild fuel-plugin-qemu*.rpm gitinfo_qemu-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
+ @tar cf - .kvmbuild fuel-plugin-kvm*.rpm gitinfo_kvm-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index 0b846547e..b608adee0 100644
--- a/build/f_isoroot/f_qemupluginbuild/config.mk
+++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-QEMU_BRANCH=c35ce3377bcf382a4e36f1df49758100cd2910b1
-QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
-QEMU_CHANGE=
+KVMFORNFV_BRANCH=c715b6029fd5b4eaf323f5efde4ec5db5ba0a9b4
+KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
+KVMFORNFV_CHANGE=