From: Michal Skalski Date: Thu, 19 Nov 2015 15:42:20 +0000 (+0100) Subject: Build OpenDaylight plugin for Fuel 7.0 X-Git-Tag: brahmaputra.1.rc1~118 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F3443%2F2;p=fuel.git Build OpenDaylight plugin for Fuel 7.0 Change-Id: Ifc529102b59d0aa3aa4b766cc592e7ee8c2eddc1 --- diff --git a/fuel/build/f_isoroot/Makefile b/fuel/build/f_isoroot/Makefile index 968806c53..3831a09f0 100644 --- a/fuel/build/f_isoroot/Makefile +++ b/fuel/build/f_isoroot/Makefile @@ -8,9 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -SUBDIRS = f_kscfg f_bootstrap f_repobuild -# Disable f_odlplugin waiting for Fuel 7 uplift -#SUBDIRS += f_odlpluginbuild +SUBDIRS = f_kscfg f_bootstrap f_repobuild f_odlpluginbuild SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) .PHONY: all diff --git a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile index b5f7ea576..df75fc695 100644 --- a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile @@ -8,7 +8,7 @@ ############################################################################## TOP := $(shell pwd) -ODL_BRANCH=juno/lithium-sr1 +ODL_BRANCH=7.0 ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" .PHONY: all @@ -33,7 +33,6 @@ release:.odlbuild sudo pip install fuel-plugin-builder git clone -b $(ODL_BRANCH) $(ODL_REPO) @$(BUILD_BASE)/check_dependencies.sh fuel-plugin-opendaylight/odl_package/ubuntu/dependencies.txt - @$(BUILD_BASE)/check_dependencies.sh fuel-plugin-opendaylight/odl_package/centos/dependencies.txt INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-opendaylight/ mv fuel-plugin-opendaylight/opendaylight*.rpm . $(REPOINFO) -r . > gitinfo_odlplugin.txt