Use OVN v21.06 in Wallaby and Victoria
This patch is a follow-up of [1]. In order to keep using the same OVS
and OVN versions used before in the stable branched Wallaby and
Victoria, this patch enforces the OVN version to v21.06
[1]https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/887666
Change-Id: I961bfb5b58d34bf6400117c6ea788231db40a5fe
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index ba4ae67..1f611db 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -238,11 +238,8 @@
ADVANCED_INSTANCE_TYPE: ds512M
ADVANCED_INSTANCE_USER: ubuntu
CUSTOMIZE_IMAGE: false
- # TODO(lucasagomes): Remove the OVN_BRANCH and OVS_BRANCH config
- # once https://review.opendev.org/c/openstack/devstack/+/887185
- # is merged
- OVN_BRANCH: "branch-22.03"
- OVS_BRANCH: "branch-3.0"
+ OVN_BRANCH: "v21.06.0"
+ OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index 38a98a9..92a3e50 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -175,11 +175,8 @@
network_api_extensions: *api_extensions
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
- # TODO(lucasagomes): Remove the OVN_BRANCH and OVS_BRANCH config
- # once https://review.opendev.org/c/openstack/devstack/+/887184
- # is merged
- OVN_BRANCH: "branch-22.03"
- OVS_BRANCH: "branch-3.0"
+ OVN_BRANCH: "v21.06.0"
+ OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
devstack_local_conf:
test-config:
$TEMPEST_CONFIG: