openstack/neutron
Code Issues Proposed changes

Merge "Use same ovs/ovn versions in local test setups"

Browse Source
This commit is contained in:
Zuul 2022-12-12 15:29:16 +00:00 committed by Gerrit Code Review
commit d250c83f23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
roles/configure_functional_tests/tasks/main.yaml
View File

@ -1,3 +1,9 @@
- name: Set optional env vars
set_fact:
override_env:
OVN_BRANCH: "{{ OVN_BRANCH | default(omit) }}"
OVS_BRANCH: "{{ OVS_BRANCH | default(omit) }}"
- shell: - shell:
cmd: | cmd: |
set -e set -e
@ -13,8 +19,6 @@
TOP_DIR={{ devstack_dir }} TOP_DIR={{ devstack_dir }}
VENV={{ tests_venv }} VENV={{ tests_venv }}
STACK_USER=stack STACK_USER=stack
OVS_BRANCH={{ OVS_BRANCH }}
OVN_BRANCH={{ OVN_BRANCH }}
Q_BUILD_OVS_FROM_GIT={{ Q_BUILD_OVS_FROM_GIT }} Q_BUILD_OVS_FROM_GIT={{ Q_BUILD_OVS_FROM_GIT }}
MEMORY_TRACKER={{ MEMORY_TRACKER }} MEMORY_TRACKER={{ MEMORY_TRACKER }}
INSTALL_OVN={{ INSTALL_OVN }} INSTALL_OVN={{ INSTALL_OVN }}
@ -22,8 +26,6 @@
DATABASE_USER=openstack_citest DATABASE_USER=openstack_citest
MYSQL_GATHER_PERFORMANCE={{ MYSQL_GATHER_PERFORMANCE | default(true) }} MYSQL_GATHER_PERFORMANCE={{ MYSQL_GATHER_PERFORMANCE | default(true) }}
source $DEVSTACK_PATH/functions
source $DEVSTACK_PATH/lib/neutron_plugins/ovn_agent
source $NEUTRON_DIR/tools/configure_for_func_testing.sh source $NEUTRON_DIR/tools/configure_for_func_testing.sh
if is_fedora; then if is_fedora; then
@ -43,3 +45,4 @@
configure_host_for_func_testing configure_host_for_func_testing
executable: /bin/bash executable: /bin/bash
environment: "{{ override_env | default({})}}"

7
tools/configure_for_func_testing.sh
View File

@ -67,9 +67,12 @@ INSTALL_MYSQL_ONLY=${INSTALL_MYSQL_ONLY:-False}
# The gate should automatically install dependencies. # The gate should automatically install dependencies.
INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE} INSTALL_BASE_DEPENDENCIES=${INSTALL_BASE_DEPENDENCIES:-$IS_GATE}
INSTALL_OVN=${INSTALL_OVN:-True} INSTALL_OVN=${INSTALL_OVN:-True}
OVN_BRANCH=${OVN_BRANCH:-main} OVN_BRANCH=${OVN_BRANCH:-v21.06.0}
Q_BUILD_OVS_FROM_GIT=${Q_BUILD_OVS_FROM_GIT:-True} Q_BUILD_OVS_FROM_GIT=${Q_BUILD_OVS_FROM_GIT:-True}
OVS_BRANCH=${OVS_BRANCH:-master} # OVS_BRANCH needs to be updated along with OVN_BRANCH, ovs is
# being used as submodule in ovn repo, to get a working ovs
# version can use git submodule status command on ovn repo
OVS_BRANCH=${OVS_BRANCH:-a4b04276ab5934d087669ff2d191a23931335c87}
if [ ! -f "$DEVSTACK_PATH/stack.sh" ]; then if [ ! -f "$DEVSTACK_PATH/stack.sh" ]; then

2
zuul.d/base.yaml
View File

@ -39,8 +39,6 @@
Q_BUILD_OVS_FROM_GIT: True Q_BUILD_OVS_FROM_GIT: True
MEMORY_TRACKER: True MEMORY_TRACKER: True
INSTALL_OVN: True INSTALL_OVN: True
OVN_BRANCH: v21.06.0
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
devstack_services: devstack_services:
# Ignore any default set by devstack. Emit a "disable_all_services". # Ignore any default set by devstack. Emit a "disable_all_services".
base: false base: false