openstack/deb-networking-odl
Code Issues Proposed changes

[Gate] Remove releases older than Boron

Browse Source 
There's no gate jobs to test these releases anymore, removing them to
simplify the gate scripts

Change-Id: I613827dccb979b7a14b200aee98c963e663dea08
This commit is contained in:
Mike Kolesnik
2017-07-11 12:00:49 +03:00
parent 1b750a45b2
commit cc29890a97
15 changed files with 18 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/devstackgaterc
View File

@@ -82,12 +82,6 @@ r="$r|(?:tempest\.scenario\.test_network_v6\.TestGettingAddress.*)"
# fixed as appropriate.
# (none)
if [[ "${ODL_RELEASE_BASE}" == "beryllium-snapshot" ]]; then
# Beryllium release has bug on security group and there is no plan
# for new release. Its last release is Beryllium-SR4.
r="$r|(?:tempest\.scenario\.test_security_groups_basic_ops.*)"
fi
# TODO(yamahata): fix bugs and remove those tests from here
# BUG: https://bugs.launchpad.net/networking-odl/+bug/1642158
# legacy netvirt ignores admin-state-up state for network/port

50
devstack/entry_points
View File

@@ -37,21 +37,11 @@ function configure_opendaylight {
$ODL_DIR/$ODL_NAME/etc/org.apache.karaf.features.cfg
fi
if [[ "$ODL_RELEASE" =~ "helium" ]]; then
# Move Tomcat to $ODL_PORT
local _ODLPORT=$(cat $ODL_DIR/$ODL_NAME/configuration/tomcat-server.xml | \
grep $ODL_PORT)
if [ "$_ODLPORT" == "" ]; then
sed -i "/\<Connector port/ s/808./$ODL_PORT/" \
$ODL_DIR/$ODL_NAME/configuration/tomcat-server.xml
fi
else
# Move Jetty to $ODL_PORT
local _ODLPORT=$(cat $ODL_DIR/$ODL_NAME/etc/jetty.xml | grep $ODL_PORT)
if [ "$_ODLPORT" == "" ]; then
sed -i "/\<Property name\=\"jetty\.port/ s/808./$ODL_PORT/" \
$ODL_DIR/$ODL_NAME/etc/jetty.xml
fi
# Move Jetty to $ODL_PORT
local _ODLPORT=$(cat $ODL_DIR/$ODL_NAME/etc/jetty.xml | grep $ODL_PORT)
if [ "$_ODLPORT" == "" ]; then
sed -i "/\<Property name\=\"jetty\.port/ s/808./$ODL_PORT/" \
$ODL_DIR/$ODL_NAME/etc/jetty.xml
fi
# Configure conntrack for legacy netvirt
@@ -114,18 +104,10 @@ function configure_opendaylight {
echo 'log4j.logger.org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.arp.GatewayMacResolverService = DEBUG, out' >> $ODL_LOGGING_CONFIG
echo 'log4j.logger.org.opendaylight.ovsdb.plugin.md.OvsdbInventoryManager = INFO, out' >> $ODL_LOGGING_CONFIG
fi
if [[ "$ODL_RELEASE" =~ "helium" ]]; then
local ODL_NEUTRON_DEBUG_LOGS=$(cat $ODL_LOGGING_CONFIG | \
grep ^log4j.logger.org.opendaylight.controller.networkconfig.neutron)
if [ "${ODL_NEUTRON_DEBUG_LOGS}" == "" ]; then
echo 'log4j.logger.org.opendaylight.controller.networkconfig.neutron = TRACE, out' >> $ODL_LOGGING_CONFIG
fi
else
local ODL_NEUTRON_DEBUG_LOGS=$(cat $ODL_LOGGING_CONFIG | \
grep ^log4j.logger.org.opendaylight.neutron)
if [ "${ODL_NEUTRON_DEBUG_LOGS}" == "" ]; then
echo 'log4j.logger.org.opendaylight.neutron = TRACE, out' >> $ODL_LOGGING_CONFIG
fi
local ODL_NEUTRON_DEBUG_LOGS=$(cat $ODL_LOGGING_CONFIG | \
grep ^log4j.logger.org.opendaylight.neutron)
if [ "${ODL_NEUTRON_DEBUG_LOGS}" == "" ]; then
echo 'log4j.logger.org.opendaylight.neutron = TRACE, out' >> $ODL_LOGGING_CONFIG
fi
fi
}
@@ -365,22 +347,8 @@ function _configure_veth {
function _configure_opendaylight_l3_legacy_netvirt {
wait_for_active_bridge $PUBLIC_BRIDGE $ODL_RETRY_SLEEP_INTERVAL $ODL_BOOT_WAIT
# Note: as of Lithium-SR3 and Beryllium releases, ODL will add the OVS port(s)
# to the external bridge via the ODL_PROVIDER_MAPPINGS method. Being so,
# the usage of PUBLIC_INTERFACE is no longer necessary in ODL devstack.
if [[ "$Q_USE_PUBLIC_VETH" == "True" ]]; then
_configure_veth
else
# DEPRECATED: Add public interface to public bridge, if needed
if [[ -n "$PUBLIC_INTERFACE" && "$PUBLIC_INTERFACE" != "br100" ]]; then
deprecated "Adding $PUBLIC_INTERFACE to $PUBLIC_BRIDGE."
deprecated "Use ODL_PROVIDER_MAPPINGS instead of PUBLIC_INTERFACE."
sudo ovs-vsctl --no-wait -- --may-exist add-port $PUBLIC_BRIDGE $PUBLIC_INTERFACE
sudo ip link set $PUBLIC_INTERFACE up
fi
move_interface_addresses "into_bridge"
fi
}

1
devstack/odl-releases/beryllium-0.4.0
View File

@@ -1 +0,0 @@
export ODL_BUNDLEVERSION='0.4.0-Beryllium'

1
devstack/odl-releases/beryllium-0.4.1-SR1
View File

@@ -1 +0,0 @@
export ODL_BUNDLEVERSION='0.4.1-Beryllium-SR1'

1
devstack/odl-releases/beryllium-0.4.2-SR2
View File

@@ -1 +0,0 @@
export ODL_BUNDLEVERSION='0.4.2-Beryllium-SR2'

1
devstack/odl-releases/beryllium-0.4.3-SR3
View File

@@ -1 +0,0 @@
export ODL_BUNDLEVERSION='0.4.3-Beryllium-SR3'

1
devstack/odl-releases/beryllium-0.4.4-SR4
View File

@@ -1 +0,0 @@
export ODL_BUNDLEVERSION='0.4.4-Beryllium-SR4'

8
devstack/odl-releases/common
View File

@@ -55,14 +55,6 @@ ODL_NETVIRT_KARAF_FEATURE_DEFAULT=odl-neutron-service,odl-restconf-all,odl-aaa-a
# new netvirt has been introduced into netvirt from Boron release
# odl-neutron-logger has been introduced from Boron release
case "$ODL_BUNDLEVERSION" in
# in Helium case, ODL_NETVIRT_KARAF_FEATURE is defined
# so ODL_NETVIRT_KARAF_FEATURE_DEFAULT doesn't matter
# Nothing to do
0.2.?-*)
;;
0.3.?-*|0.4.?-*)
ODL_NETVIRT_KARAF_FEATURE_DEFAULT+=,$ODL_NETVIRT_KARAF_FEATURE_OVSDB
;;
0.5.?-*)
# 0.5.?-*
ODL_NETVIRT_KARAF_FEATURE_DEFAULT+=,$ODL_NETVIRT_KARAF_FEATURE_VPNSERVICE

17
devstack/odl-releases/helium-0.2.3-SR3
View File

@@ -1,17 +0,0 @@
# Short name of ODL package
export ODL_NAME=distribution-karaf-0.2.3-Helium-SR3
# Java major version required to run OpenDaylight: 7, 8, ...
ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}
# overwrite this function
function setup_opendaylight_package {
# The OpenDaylight URL
export ODL_URL=${ODL_URL_PREFIX}/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.2.3-Helium-SR3
# The OpenDaylight Package
export ODL_PKG=distribution-karaf-0.2.3-Helium-SR3.zip
}
# The network virtualization feature used by opendaylight loaded by Karaf
ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-base-all,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-adsal-northbound,odl-nsf-all,odl-ovsdb-northbound,odl-ovsdb-openstack}

4
devstack/odl-releases/lithium-0.3.1-SR1
View File

@@ -1,4 +0,0 @@
export ODL_BUNDLEVERSION='0.3.1-Lithium-SR1'
# Java major version required to run OpenDaylight: 7, 8, ...
ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}

4
devstack/odl-releases/lithium-0.3.2-SR2
View File

@@ -1,4 +0,0 @@
export ODL_BUNDLEVERSION='0.3.2-Lithium-SR2'
# Java major version required to run OpenDaylight: 7, 8, ...
ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}

4
devstack/odl-releases/lithium-0.3.3-SR3
View File

@@ -1,4 +0,0 @@
export ODL_BUNDLEVERSION='0.3.3-Lithium-SR3'
# Java major version required to run OpenDaylight: 7, 8, ...
ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}

4
devstack/odl-releases/lithium-0.3.4-SR4
View File

@@ -1,4 +0,0 @@
export ODL_BUNDLEVERSION='0.3.4-Lithium-SR4'
# Java major version required to run OpenDaylight: 7, 8, ...
ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}

51
devstack/pre_test_hook.sh
View File

@@ -21,10 +21,6 @@ case "$ODL_RELEASE_BASE" in
boron-snapshot)
ODL_RELEASE=boron-snapshot-0.5
;;
beryllium-snapshot)
# NOTE(yamahata): beryllium release is end by SR4. no more snapshot
ODL_RELEASE=beryllium-0.4.4-SR4
;;
*)
echo "Unknown ODL release base: $ODL_RELEASE_BASE"
exit 1
@@ -43,43 +39,13 @@ case "$ODL_GATE_V2DRIVER" in
;;
esac
if [[ -z "$ODL_GATE_PORT_BINDING" ]]; then
case "$ODL_RELEASE_BASE" in
beryllium-snapshot)
# pseudo-agentdb-binding is supported from boron
ODL_GATE_PORT_BINDING=legacy-port-binding
;;
*)
ODL_GATE_PORT_BINDING=pseudo-agentdb-binding
;;
esac
fi
case "$ODL_GATE_PORT_BINDING" in
pseudo-agentdb-binding)
ODL_PORT_BINDING_CONTROLLER=pseudo-agentdb-binding
;;
legacy-port-binding)
ODL_PORT_BINDING_CONTROLLER=legacy-port-binding
;;
*)
echo "Unknown port binding controller: $ODL_GATE_PORT_BINDING"
exit 1
;;
esac
ODL_PORT_BINDING_CONTROLLER=pseudo-agentdb-binding
ODL_GATE_SERVICE_PROVIDER=${ODL_GATE_SERVICE_PROVIDER%-}
if [[ -z "$ODL_GATE_SERVICE_PROVIDER" ]] && [[ -n "${RALLY_SCENARIO}" ]]; then
case "$ODL_RELEASE_BASE" in
beryllium-snapshot)
# new netvirt was introduced from boron
ODL_GATE_SERVICE_PROVIDER=netvirt
;;
*)
ODL_GATE_SERVICE_PROVIDER=vpnservice
;;
esac
ODL_GATE_SERVICE_PROVIDER=vpnservice
fi
case "$ODL_GATE_SERVICE_PROVIDER" in
vpnservice)
ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-openstack
@@ -92,16 +58,11 @@ case "$ODL_GATE_SERVICE_PROVIDER" in
ODL_MAPPING_KEY=br-ex
;;
esac
# add odl-neutron-logger for debugging
# odl-neutorn-logger has been introduced from boron cycle
ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger
case "$ODL_RELEASE_BASE" in
boron-snapshot)
ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger
;;
carbon-snapshot|nitrogen-snapshot)
ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger,odl-neutron-hostconfig-ovs
;;
*)
ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-hostconfig-ovs
;;
esac

18
devstack/settings.odl
View File

@@ -17,16 +17,6 @@
# boron-0.5.2-SR2
# boron-0.5.1-SR1
# boron-0.5.0
# beryllium-0.4.4-SR4
# beryllium-0.4.3-SR3
# beryllium-0.4.2-SR2
# beryllium-0.4.1-SR1
# beryllium-0.4.0
# lithium-0.3.4-SR4 (SR4)
# lithium-0.3.3-SR3 (SR3)
# lithium-0.3.2-SR2 (SR2)
# lithium-0.3.1-SR1 (SR1)
# helium-0.2.3-SR3
ODL_RELEASE=${ODL_RELEASE:-latest-snapshot}
@@ -46,10 +36,9 @@ ODL_MGR_HOST=${ODL_MGR_HOST:-$SERVICE_HOST}
# Example of expected format: ODL_OVS_MANAGERS=1.1.1.1,2.2.2.2,3.3.3.3
ODL_OVS_MANAGERS=${ODL_OVS_MANAGERS:-$ODL_MGR_HOST}
# The default ODL port for Tomcat to use
# The default ODL port for Jetty to use
# NOTE: We make this configurable because by default, ODL uses port 8080 for
# Tomcat (Helium releases) or Jetty (Lithium and later releases), and this
# conflicts with swift which also uses port 8080.
# Jetty, and this conflicts with swift which also uses port 8080.
ODL_PORT=${ODL_PORT:-8087}
# The ODL endpoint URL
@@ -130,9 +119,8 @@ SKIP_OVS_INSTALL=$(trueorfalse False SKIP_OVS_INSTALL)
ODL_HOSTCONF_URI=${ODL_HOSTCONF_URI:-}
# Port binding controller
# pseudo-agentdb-binding, legacy-port-binding or network-topology
# pseudo-agentdb-binding, legacy-port-binding
# pseudo-agentdb-binding is supported by Boron or later
# network-topology is deprecated
ODL_PORT_BINDING_CONTROLLER=${ODL_PORT_BINDING_CONTROLLER:-pseudo-agentdb-binding}
# Snapshot version - allows using a specific version e.g. 0.5.0-20160719.101233-3643