X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Finclude-raw-openstack-ci.sh;h=a1dff89133f31212718820af64b5aff686f5207b;hb=0e53a789bf89f4eab48233bdfc38cc2b5c907660;hp=272149fa960c9cedb0b77769d680461514d9d663;hpb=622bb07eb5b4673333ee9891b4326382103bb307;p=releng%2Fbuilder.git diff --git a/jjb/neutron/include-raw-openstack-ci.sh b/jjb/neutron/include-raw-openstack-ci.sh index 272149fa9..a1dff8913 100644 --- a/jjb/neutron/include-raw-openstack-ci.sh +++ b/jjb/neutron/include-raw-openstack-ci.sh @@ -80,19 +80,11 @@ fi ## # Trim down the boot wait time ## export ODL_BOOT_WAIT=30 -# Use Lithium build, if asked to do so +# Use specific build, if asked to do so if [ "${ODL_VERSION}" == "lithium-latest" ] ; then - NEXUSPATH="${URL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf" - BUNDLEVERSION='0.3.0-SNAPSHOT' - - # Acquire the timestamp information from maven-metadata.xml - wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml - BUNDLE_TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null` - echo "Nexus timestamp is ${BUNDLE_TIMESTAMP}" - - DEVSTACK_LOCAL_CONFIG+="ODL_NAME=distribution-karaf-${BUNDLEVERSION};" - DEVSTACK_LOCAL_CONFIG+="ODL_PKG=distribution-karaf-${BUNDLE_TIMESTAMP}.zip;" - DEVSTACK_LOCAL_CONFIG+="ODL_URL=${NEXUSPATH}/${BUNDLEVERSION};" + DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=lithium-snapshot;" +elif [ "${ODL_VERSION}" == "helium" ] ; then + DEVSTACK_LOCAL_CONFIG+="ODL_RELEASE=helium;" fi # If Karaf netvirt feature was explicitly provided, add it to DEVSTACK_LOCAL_CONFIG