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 1 week ago
parent
commit
6d540e49e6

+ 1
- 1
devstack/devstackgaterc View File

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

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

@@ -52,7 +52,7 @@ OVN_REPO_NAME=$(basename ${OVN_REPO} | cut -f1 -d'.')
52 52
 NETWORKING_OVN_DIR=$DEST/networking-ovn
53 53
 
54 54
 # The branch to use from $OVN_REPO
55
-OVN_BRANCH=${OVN_BRANCH:-master}
55
+OVN_BRANCH=${OVN_BRANCH:-branch-2.12}
56 56
 
57 57
 # How to connect to ovsdb-server hosting the OVN SB database.
58 58
 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/
9 9
 devstack_localrc base OVN_BRANCH="branch-2.11"
10 10
 
11 11
 devstack_localrc target enable_plugin networking-ovn http://opendev.org/openstack/networking-ovn
12
-devstack_localrc target OVN_BRANCH="master"
12
+devstack_localrc target OVN_BRANCH="branch-2.12"
13 13
 
14 14
 # Common options for both base and target DevStack
15 15
 for i in base target; do

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

@@ -42,6 +42,8 @@
42 42
           # our project repository. This makes zuul do the right
43 43
           # reference magic for testing changes.
44 44
           export PROJECTS="openstack/networking-ovn $PROJECTS"
45
+          export OVN_BRANCH="branch-2.12"
46
+          export OVS_BRANCH="branch-2.12"
45 47
 
46 48
           function gate_hook {
47 49
               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 @@
43 43
           # our project repository. This makes zuul do the right
44 44
           # reference magic for testing changes.
45 45
           export PROJECTS="openstack/networking-ovn $PROJECTS"
46
-
46
+          export OVN_BRANCH="branch-2.12"
47
+          export OVS_BRANCH="branch-2.12"
47 48
           function gate_hook {
48 49
               bash -xe $BASE/new/networking-ovn/networking_ovn/tests/contrib/gate_hook.sh dsvm-functional
49 50
           }

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

@@ -229,7 +229,7 @@
229 229
     parent: networking-ovn-base
230 230
     vars:
231 231
       devstack_localrc:
232
-        OVN_BRANCH: master
232
+        OVN_BRANCH: branch-2.12
233 233
 
234 234
 - job:
235 235
     name: networking-ovn-tempest-dsvm-ovs-release
@@ -294,6 +294,7 @@
294 294
         Q_USE_PROVIDERNET_FOR_PUBLIC: true
295 295
         ENABLE_CHASSIS_AS_GW: true
296 296
         OVN_L3_CREATE_PUBLIC_NETWORK: true
297
+        OVN_BRANCH: branch-2.12
297 298
       rally_task: rally-jobs/ovn.yaml
298 299
     timeout: 7800
299 300
 
@@ -384,8 +385,8 @@
384 385
           (^tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225Test)|\
385 386
           (^tempest.api.compute.admin.test_live_migration.LiveMigrationTest)"
386 387
       devstack_localrc:
387
-        OVN_BRANCH: master
388
+        OVN_BRANCH: branch-2.12
388 389
     group-vars:
389 390
       subnode:
390 391
         devstack_localrc:
391
-          OVN_BRANCH: master
392
+          OVN_BRANCH: branch-2.12

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

@@ -12,7 +12,8 @@
12 12
             voting: false
13 13
         - networking-ovn-tempest-dsvm-ovs-release
14 14
         - networking-ovn-tempest-dsvm-ovs-release-python2
15
-        - networking-ovn-rally-task
15
+        - networking-ovn-rally-task:
16
+            voting: false
16 17
         - networking-ovn-dsvm-functional-py27
17 18
         - networking-ovn-dsvm-functional:
18 19
             branches: ^(?!stable/newton).*$
@@ -41,7 +42,8 @@
41 42
       jobs:
42 43
         - networking-ovn-tempest-dsvm-ovs-release
43 44
         - networking-ovn-tempest-dsvm-ovs-release-python2
44
-        - networking-ovn-rally-task
45
+       # Until https://review.opendev.org/#/c/680995/ merges, unblock the gate
46
+       #- networking-ovn-rally-task
45 47
         - networking-ovn-dsvm-functional-py27
46 48
         - networking-ovn-dsvm-functional:
47 49
             branches: ^(?!stable/newton).*$

Loading…
Cancel
Save