Switch jobs to run on ubuntu noble

Default testing distro for epoxy cycle is ubuntu noble[1].
Also noble includes OVN latest LTS version i.e 24.03 so
removing build from source vars.
Also use crudini package instead of pip module as latest
pip don't allow modules to be install system wide.

[1] https://governance.openstack.org/tc/reference/runtimes/2025.1.html

Change-Id: I10a46b9f9aa1708b840353892e95069c0ffa5d06
This commit is contained in:
yatinkarel 2024-12-27 13:17:20 +05:30
parent a575b79451
commit 204b394315
5 changed files with 7 additions and 20 deletions

View File

@ -4,7 +4,7 @@
tasks: tasks:
- name: crudini - name: crudini
pip: package:
name: crudini name: crudini
state: present state: present
become: yes become: yes

View File

@ -582,7 +582,7 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
wait_until_active=True, timeout=30): wait_until_active=True, timeout=30):
host_ip = ssh_client.host host_ip = ssh_client.host
service_name = ssh_client.exec_command( service_name = ssh_client.exec_command(
"systemctl list-unit-files --type service | grep {} | " "systemctl list-unit-files --type service | grep {}.service | "
"cut -d' ' -f1".format( "cut -d' ' -f1".format(
service_alias.replace(" ", ".*"))).strip() service_alias.replace(" ", ".*"))).strip()
LOG.debug("Restarting service '%s' on host '%s'.", LOG.debug("Restarting service '%s' on host '%s'.",
@ -1320,7 +1320,7 @@ class BaseTempestTestCaseOvn(BaseTempestWhiteboxTestCase):
return [cls.get_podified_ovn_db_cmd('nb'), return [cls.get_podified_ovn_db_cmd('nb'),
cls.get_podified_ovn_db_cmd('sb')] cls.get_podified_ovn_db_cmd('sb')]
if WB_CONF.openstack_type == 'devstack': if WB_CONF.openstack_type == 'devstack':
sbdb = "unix:/usr/local/var/run/ovn/ovnsb_db.sock" sbdb = "unix:/var/run/ovn/ovnsb_db.sock"
nbdb = sbdb.replace('sb', 'nb') nbdb = sbdb.replace('sb', 'nb')
cmd = "sudo ovn-{}ctl --db={}" cmd = "sudo ovn-{}ctl --db={}"
return [cmd.format('nb', nbdb), cmd.format('sb', sbdb)] return [cmd.format('nb', nbdb), cmd.format('sb', sbdb)]

View File

@ -53,7 +53,7 @@ class BaseSecGroupLoggingTest(
SG_LOG_FILE = '/var/log/messages' SG_LOG_FILE = '/var/log/messages'
rotate_service_fix = '-crond' rotate_service_fix = '-crond'
elif WB_CONF.openstack_type == 'devstack': elif WB_CONF.openstack_type == 'devstack':
SG_LOG_FILE = '/opt/stack/logs/ovn-controller.log' SG_LOG_FILE = '/var/log/ovn/ovn-controller.log'
rotate_service_fix = '' rotate_service_fix = ''
else: else:
SG_LOG_FILE = '/var/log/containers/stdouts/ovn_controller.log' SG_LOG_FILE = '/var/log/containers/stdouts/ovn_controller.log'

View File

@ -1,8 +1,8 @@
- nodeset: - nodeset:
name: whitebox-neutron-single-node-ubuntu-jammy name: whitebox-neutron-single-node-ubuntu-noble
nodes: nodes:
- name: controller - name: controller
label: nested-virt-ubuntu-jammy label: nested-virt-ubuntu-noble
groups: groups:
- name: tempest - name: tempest
nodes: nodes:
@ -16,7 +16,7 @@
regex: ^(unmaintained|stable/(victoria|wallaby|xena|yoga|zed)).*$ regex: ^(unmaintained|stable/(victoria|wallaby|xena|yoga|zed)).*$
negate: true negate: true
# Comment nodeset and vars to switch back to non nested nodes # Comment nodeset and vars to switch back to non nested nodes
nodeset: whitebox-neutron-single-node-ubuntu-jammy nodeset: whitebox-neutron-single-node-ubuntu-noble
vars: &nested_virt_vars vars: &nested_virt_vars
devstack_localrc: devstack_localrc:
LIBVIRT_TYPE: kvm LIBVIRT_TYPE: kvm

View File

@ -59,13 +59,6 @@
# TODO(lucasagomes): Re-enable MOD_WSGI after # TODO(lucasagomes): Re-enable MOD_WSGI after
# https://bugs.launchpad.net/neutron/+bug/1912359 is implemented # https://bugs.launchpad.net/neutron/+bug/1912359 is implemented
NEUTRON_DEPLOY_MOD_WSGI: false NEUTRON_DEPLOY_MOD_WSGI: false
# TODO(ihrachys): remove OVN_BUILD_FROM_SOURCE once the OS packages
# include at least OVN v22.03.3.
OVN_BUILD_FROM_SOURCE: True
# TODO(ihrachys): switch back to a tagged version when it's released
# OVN_BRANCH: "v22.03.3"
OVN_BRANCH: "36e3ab9b47e93af0599a818e9d6b2930e49473f0"
OVS_BRANCH: "2410b95597fcec5f733caf77febdb46f4ffacd27"
devstack_plugins: devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git neutron: https://opendev.org/openstack/neutron.git
neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git
@ -287,12 +280,6 @@
OVN_DBS_LOG_LEVEL: dbg OVN_DBS_LOG_LEVEL: dbg
ENABLE_TLS: True ENABLE_TLS: True
OVN_IGMP_SNOOPING_ENABLE: True OVN_IGMP_SNOOPING_ENABLE: True
# TODO(ihrachys): remove OVN_BUILD_FROM_SOURCE once the OS packages
# include at least OVN v22.03.3.
OVN_BUILD_FROM_SOURCE: True
OVN_BRANCH: "v23.09.0"
OVS_BRANCH: "v3.2.0-20-g1d78a3f31"
OVS_SYSCONFDIR: "/usr/local/etc/openvswitch"
devstack_services: devstack_services:
br-ex-tcpdump: true br-ex-tcpdump: true
br-int-flows: true br-int-flows: true