make use of ODL_RELEASE in networking-odl

Use ODL_RELEASE to delegate what ODL build should be used.
This is now possible due to gerrits:
    https://review.openstack.org/#/c/179129/
    https://review.openstack.org/#/c/179861/

Change-Id: I66ae6cb30f6f5207db4a4102c3943ee873c8e082
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/jjb/neutron/include-raw-openstack-ci.sh b/jjb/neutron/include-raw-openstack-ci.sh
index 272149fa960c9cedb0b77769d680461514d9d663..a1dff89133f31212718820af64b5aff686f5207b 100644 (file)
--- 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

diff --git a/jjb/ovsdb/include-raw-openstack-ci.sh b/jjb/ovsdb/include-raw-openstack-ci.sh
index 9fbd6b8ba47b14ef7690f6e192ecbc67b27bec2b..1b4277baa426dae1893f159e4134b3be67b57fd6 100644 (file)
--- a/jjb/ovsdb/include-raw-openstack-ci.sh
+++ b/jjb/ovsdb/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
 
 # And this runs devstack-gate