diff options
| author | Zuul <zuul@review.opendev.org> | 2026-04-21 20:37:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-04-21 20:37:53 +0000 |
| commit | cf19a244421c5ace22ac974082d17eab119cdb59 (patch) | |
| tree | a4d9a345556170671b750e90c3ded98f98e96522 /tests | |
| parent | 0fb74c4ab1725d8991b9c5b6bde7e68ff3fcc2d5 (diff) | |
| parent | 93e7d719a81fee0db977895b53aa3518f19eda0f (diff) | |
| download | kolla-ansible-cf19a244421c5ace22ac974082d17eab119cdb59.tar.gz kolla-ansible-cf19a244421c5ace22ac974082d17eab119cdb59.zip | |
Merge "CI: Fix ovn-upgrade jobs"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run.yml | 3 | ||||
| -rw-r--r-- | tests/templates/globals-default.j2 | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/run.yml b/tests/run.yml index 775eb2630..8dd6c62c6 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -431,8 +431,9 @@ - name: Test OVN VPNaaS import_role: - name: test-ovn-vpnaas + name: kolla-ansible-test-ovn-vpnaas when: + - not is_upgrade - scenario == 'ovn' # FIXME(neutron): Enable when https://bugs.launchpad.net/neutron/+bug/2146308 is fixed - not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '10') diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 5ed942810..f5f005acd 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -195,7 +195,9 @@ neutron_plugin_agent: "ovn" neutron_ovn_distributed_fip: "yes" neutron_enable_ovn_agent: "yes" ovn_sb_db_relay_count: "3" +{% if not is_upgrade %} enable_neutron_vpnaas: "yes" +{% endif %} enable_octavia: "yes" octavia_provider_drivers: "ovn:OVN provider" octavia_provider_agents: "ovn" |