X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build%2Ff_isoroot%2Ff_odlpluginbuild%2Fconfig.mk;h=6d176fb75c4c2cb70ab4ae303b17fc34be63bc4b;hb=98f171c82636c29a9cfd5c94c8e7aac7ca7af41b;hp=f9666e8c2f8e10e73edf84e6081d9ddde45da7ed;hpb=a71ccaa852a7a0091fce50045f29ab5119a7811b;p=fuel.git diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index f9666e8c2..6d176fb75 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -7,11 +7,9 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -ODL_BRANCH=brahmaputra-sr2 -ODL_CHANGE=280810a01c2a05535272df86dc599ddacd23bb78 -ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" +FUEL_PLUGIN_ODL_BRANCH ?= master +FUEL_PLUGIN_ODL_CHANGE ?= 32b7edbde866b6a4c1c61e674ddf01a93dd010a2 +FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git -export USE_JAVA8=true -export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb -export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz -export ODL_VERSION_NUMBER=0.4.1 +export OPNFV_BUILD?=true +export ODL_VERSIONS?=5.0.0.1 5.2.0.1