Browse Source

Fix broken gate because of OVS module compilation

Fix functional jobs by installing missing dependencies

Six is needed for the OVS/OVN compilation and tox to run the tests
itself.

Update OVS/OVN to version 2.12 in order to have possibility to
compile it under Ubuntu Bionic.

There is no need to compile OVS kernel module for functional tests,
so disable it.

Change-Id: Ia0ba2e78d4f97294a93ff127d9098978af21ba53
Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
(cherry picked from commit b568395182)
changes/17/737817/3
Lucas Alvares Gomes 1 month ago
committed by Maciej Józefczyk
parent
commit
a9d84b4f4b
7 changed files with 15 additions and 11 deletions
  1. +1
    -1
      devstack/lib/networking-ovn
  2. +1
    -1
      devstack/local.conf.sample
  3. +1
    -1
      devstack/upgrade/settings
  4. +7
    -3
      networking_ovn/tests/contrib/gate_hook.sh
  5. +2
    -2
      playbooks/legacy/networking-ovn-dsvm-functional-py35/run.yaml
  6. +2
    -2
      playbooks/legacy/networking-ovn-dsvm-functional/run.yaml
  7. +1
    -1
      zuul.d/networkin-ovn-rally-task.yaml

+ 1
- 1
devstack/lib/networking-ovn View File

@@ -52,7 +52,7 @@ OVN_REPO_NAME=$(basename ${OVN_REPO} | cut -f1 -d'.')
NETWORKING_OVN_DIR=$DEST/networking-ovn

# The branch to use from $OVN_REPO
OVN_BRANCH=${OVN_BRANCH:-branch-2.11}
OVN_BRANCH=${OVN_BRANCH:-branch-2.12}

# How to connect to ovsdb-server hosting the OVN SB database.
OVN_SB_REMOTE=${OVN_SB_REMOTE:-tcp:$SERVICE_HOST:6642}


+ 1
- 1
devstack/local.conf.sample View File

@@ -20,7 +20,7 @@ ADMIN_PASSWORD=password
# repo. You can optionally use a different one. For example, you may want to
# use the latest patches in blp's ovn branch:
#OVN_REPO=https://github.com/blp/ovs-reviews.git
OVN_BRANCH=branch-2.11
OVN_BRANCH=branch-2.12

enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn stable/queens
enable_service ovn-northd


+ 1
- 1
devstack/upgrade/settings View File

@@ -6,4 +6,4 @@ devstack_localrc target enable_plugin networking-ovn http://git.openstack.org/op
devstack_localrc target PUBLIC_BRIDGE=br-ex
devstack_localrc target enable_service s-account s-container s-object s-proxy
devstack_localrc target disable_service q-agt
devstack_localrc target OVN_BRANCH="branch-2.11"
devstack_localrc target OVN_BRANCH="branch-2.12"

+ 7
- 3
networking_ovn/tests/contrib/gate_hook.sh View File

@@ -18,7 +18,11 @@ case $VENV in
# the CI are breaking because of missing six package.
# Installing the package for now as a workaround
# https://bugs.launchpad.net/networking-ovn/+bug/1648670
sudo pip install six
if python3_enabled; then
install_package python3-six python3-tox
else
install_package python-six python-tox
fi
# Install SSL dependencies here for now as a workaround
# https://bugs.launchpad.net/networking-ovn/+bug/1696713
if is_fedora ; then
@@ -31,8 +35,8 @@ case $VENV in
remove_ovs_packages
# compile_ovs expects "DEST" to be defined
DEST=$GATE_DEST
OVS_BRANCH=branch-2.11
compile_ovs True /usr/local /var
OVS_BRANCH=branch-2.12
compile_ovs False /usr/local /var

# Make the workspace owned by GATE_STACK_USER
sudo chown -R $GATE_STACK_USER:$GATE_STACK_USER $BASE


+ 2
- 2
playbooks/legacy/networking-ovn-dsvm-functional-py35/run.yaml View File

@@ -43,8 +43,8 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-ovn $PROJECTS"
export OVN_BRANCH="branch-2.11"
export OVS_BRANCH="branch-2.11"
export OVN_BRANCH="branch-2.12"
export OVS_BRANCH="branch-2.12"

function gate_hook {
bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/gate_hook.sh dsvm-functional-py35


+ 2
- 2
playbooks/legacy/networking-ovn-dsvm-functional/run.yaml View File

@@ -42,8 +42,8 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-ovn $PROJECTS"
export OVN_BRANCH="branch-2.11"
export OVS_BRANCH="branch-2.11"
export OVN_BRANCH="branch-2.12"
export OVS_BRANCH="branch-2.12"
function gate_hook {
bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/gate_hook.sh dsvm-functional
}


+ 1
- 1
zuul.d/networkin-ovn-rally-task.yaml View File

@@ -25,6 +25,6 @@
Q_USE_PROVIDERNET_FOR_PUBLIC: true
ENABLE_CHASSIS_AS_GW: true
OVN_L3_CREATE_PUBLIC_NETWORK: true
OVN_BRANCH: branch-2.11
OVN_BRANCH: branch-2.12
rally_task: rally-jobs/ovn.yaml
timeout: 7800

Loading…
Cancel
Save