Browse Source

Temporarily switch master jobs to OVS 2.12 branch

While we adjust the jobs to build OVN from the new repo,
this patch is switching jobs that build OVS/OVN from master to
use the recently created branch-2.12.

In addition, make rally non-voting until
[1] is merged, the gate is broken there as well. So since there
are two separate issues breaking the gate, they can't depend on
each other to merge so fix it here. (It appears to be past
working hours for rally-core)

This patch must be reverted when [0] and [1] get merged.

[0] https://review.opendev.org/#/c/673236/
[1] https://review.opendev.org/#/c/681001/
Signed-off-by: Daniel Alvarez <dalvarez@redhat.com>

Change-Id: I63d12861e1ff5d444d116188a2a122eca5c45af0
tags/7.0.0.0b1
Daniel Alvarez 5 months ago
parent
commit
6d540e49e6
7 changed files with 15 additions and 9 deletions
  1. +1
    -1
      devstack/devstackgaterc
  2. +1
    -1
      devstack/lib/networking-ovn
  3. +1
    -1
      devstack/upgrade/settings
  4. +2
    -0
      playbooks/legacy/networking-ovn-dsvm-functional-py27/run.yaml
  5. +2
    -1
      playbooks/legacy/networking-ovn-dsvm-functional/run.yaml
  6. +4
    -3
      zuul.d/networking-ovn-jobs.yaml
  7. +4
    -2
      zuul.d/project.yaml

+ 1
- 1
devstack/devstackgaterc View File

@@ -33,7 +33,7 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=public"
if [[ "${OVN_OPTS}" == *"latest-release"* ]] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVN_BRANCH=branch-2.11"
elif [[ "${OVN_OPTS}" == *"master"* ]] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVN_BRANCH=master"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVN_BRANCH=branch-2.12"
else
echo "No ovs branch specified, using the default from the devstack plugin"
fi

+ 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:-master}
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/upgrade/settings View File

@@ -9,7 +9,7 @@ devstack_localrc base enable_plugin networking-ovn http://opendev.org/openstack/
devstack_localrc base OVN_BRANCH="branch-2.11"

devstack_localrc target enable_plugin networking-ovn http://opendev.org/openstack/networking-ovn
devstack_localrc target OVN_BRANCH="master"
devstack_localrc target OVN_BRANCH="branch-2.12"

# Common options for both base and target DevStack
for i in base target; do

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

@@ -42,6 +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.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-py27

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

@@ -43,7 +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.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
}

+ 4
- 3
zuul.d/networking-ovn-jobs.yaml View File

@@ -229,7 +229,7 @@
parent: networking-ovn-base
vars:
devstack_localrc:
OVN_BRANCH: master
OVN_BRANCH: branch-2.12

- job:
name: networking-ovn-tempest-dsvm-ovs-release
@@ -294,6 +294,7 @@
Q_USE_PROVIDERNET_FOR_PUBLIC: true
ENABLE_CHASSIS_AS_GW: true
OVN_L3_CREATE_PUBLIC_NETWORK: true
OVN_BRANCH: branch-2.12
rally_task: rally-jobs/ovn.yaml
timeout: 7800

@@ -384,8 +385,8 @@
(^tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225Test)|\
(^tempest.api.compute.admin.test_live_migration.LiveMigrationTest)"
devstack_localrc:
OVN_BRANCH: master
OVN_BRANCH: branch-2.12
group-vars:
subnode:
devstack_localrc:
OVN_BRANCH: master
OVN_BRANCH: branch-2.12

+ 4
- 2
zuul.d/project.yaml View File

@@ -12,7 +12,8 @@
voting: false
- networking-ovn-tempest-dsvm-ovs-release
- networking-ovn-tempest-dsvm-ovs-release-python2
- networking-ovn-rally-task
- networking-ovn-rally-task:
voting: false
- networking-ovn-dsvm-functional-py27
- networking-ovn-dsvm-functional:
branches: ^(?!stable/newton).*$
@@ -41,7 +42,8 @@
jobs:
- networking-ovn-tempest-dsvm-ovs-release
- networking-ovn-tempest-dsvm-ovs-release-python2
- networking-ovn-rally-task
# Until https://review.opendev.org/#/c/680995/ merges, unblock the gate
#- networking-ovn-rally-task
- networking-ovn-dsvm-functional-py27
- networking-ovn-dsvm-functional:
branches: ^(?!stable/newton).*$

Loading…
Cancel
Save