Replace ubuntu-focal by ubuntu-jammy
nova compute requires libvirt 7.0.0 or newer, which means no job can be executed on Ubuntu 20.04 Besides, devstack drops support for focal on this patch: https://review.opendev.org/c/openstack/devstack/+/885468 Change-Id: I6fa5b70558e886b17c63dab61fad3c7a2728d148
This commit is contained in:
parent
af7ba5759f
commit
958b33820c
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@ -13,7 +13,7 @@ MEMORY = ENV.fetch("VM_SIZE", "8192").to_i
|
||||
# Every Vagrant development environment requires a box. You can search for
|
||||
# boxes at https://vagrantcloud.com/search.
|
||||
# BOX = ENV.fetch("VM_BOX", "generic/centos8")
|
||||
BOX = ENV.fetch("VM_BOX", "generic/ubuntu2004")
|
||||
BOX = ENV.fetch("VM_BOX", "generic/ubuntu2204")
|
||||
|
||||
# Machine host name
|
||||
HOSTNAME = "devstack"
|
||||
|
@ -55,6 +55,7 @@ function configure_tobiko {
|
||||
configure_tobiko_neutron "${tobiko_conf_file}"
|
||||
configure_tobiko_ssh "${tobiko_conf_file}"
|
||||
configure_tobiko_tripleo "${tobiko_conf_file}"
|
||||
configure_tobiko_octavia "${tobiko_conf_file}"
|
||||
|
||||
echo_summary "Apply changes to actual ${TOBIKO_CONF_FILE} file."
|
||||
sudo mkdir -p $(dirname "${TOBIKO_CONF_FILE}")
|
||||
@ -221,6 +222,16 @@ function configure_tobiko_tripleo {
|
||||
}
|
||||
|
||||
|
||||
function configure_tobiko_octavia {
|
||||
echo_summary "Write [octavia] section to ${TOBIKO_CONF_FILE}"
|
||||
local tobiko_conf_file=$1
|
||||
|
||||
# Ensure Tobiko will skip looking for the undercloud node
|
||||
iniset_nonempty "${tobiko_conf_file}" octavia check_timeout \
|
||||
"${TOBIKO_OCTAVIA_CHECK_TIMEOUT}"
|
||||
}
|
||||
|
||||
|
||||
function configure_key_file {
|
||||
local tobiko_conf_file=$1
|
||||
|
||||
|
@ -45,3 +45,6 @@ TOBIKO_NEUTRON_IPV6_DNS_NAMESERVERS=${TOBIKO_NEUTRON_IPV6_DNS_NAMESERVERS:-}
|
||||
|
||||
# --- SSH settings ---
|
||||
TOBIKO_SSH_KEY_FILE=${TOBIKO_SSH_KEY_FILE:-}
|
||||
|
||||
# --- Octavia settings ---
|
||||
TOBIKO_OCTAVIA_CHECK_TIMEOUT=${TOBIKO_OCTAVIA_CHECK_TIMEOUT:-360}
|
||||
|
@ -19,15 +19,12 @@
|
||||
|
||||
- job:
|
||||
name: devstack-tobiko-designate
|
||||
parent: devstack-tobiko-minimal
|
||||
nodeset: devstack-tobiko-focal
|
||||
parent: devstack-tobiko
|
||||
voting: true
|
||||
required-projects: &REQUIRED_PROJECTS
|
||||
- opendev.org/openstack/designate
|
||||
- opendev.org/openstack/python-designateclient
|
||||
vars: &VARS
|
||||
devstack_localrc:
|
||||
API_WORKERS: 4
|
||||
devstack_plugins:
|
||||
designate: https://opendev.org/openstack/designate.git
|
||||
devstack_services:
|
||||
|
@ -16,7 +16,9 @@
|
||||
abstract: false
|
||||
name: devstack-tobiko-functional
|
||||
parent: devstack-tobiko-designate
|
||||
voting: true
|
||||
# TODO(eolivare): remove this when the fix is merged on tobiko project:
|
||||
# https://review.opendev.org/c/x/tobiko/+/894522
|
||||
voting: false
|
||||
description: Run tobiko functional test cases
|
||||
vars:
|
||||
test_workflow: functional
|
||||
|
@ -15,7 +15,7 @@
|
||||
- job:
|
||||
name: devstack-tobiko-heat
|
||||
parent: devstack-tobiko-minimal
|
||||
nodeset: devstack-tobiko-focal
|
||||
nodeset: devstack-tobiko-jammy
|
||||
required-projects:
|
||||
- openstack/heat
|
||||
voting: true
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
- job:
|
||||
name: devstack-tobiko-nova
|
||||
parent: devstack-tobiko-minimal
|
||||
parent: devstack-tobiko
|
||||
required-projects:
|
||||
- openstack/nova
|
||||
voting: true
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
- job:
|
||||
name: devstack-tobiko-octavia
|
||||
parent: devstack-tobiko-minimal
|
||||
parent: devstack-tobiko
|
||||
required-projects:
|
||||
- openstack/octavia
|
||||
- openstack/octavia-lib
|
||||
@ -54,8 +54,7 @@
|
||||
loadbalancer_topology: SINGLE
|
||||
devstack_localrc:
|
||||
OCTAVIA_NODE: standalone
|
||||
LIBVIRT_TYPE: kvm
|
||||
LIBVIRT_CPU_MODE: host-passthrough
|
||||
TOBIKO_OCTAVIA_CHECK_TIMEOUT: 600
|
||||
devstack_plugins:
|
||||
barbican: https://opendev.org/openstack/barbican.git
|
||||
octavia: https://opendev.org/openstack/octavia.git
|
||||
|
@ -20,7 +20,6 @@
|
||||
abstract: false
|
||||
name: devstack-tobiko
|
||||
parent: devstack-tobiko-minimal
|
||||
nodeset: devstack-tobiko-focal
|
||||
voting: true
|
||||
description: |
|
||||
Base Devstack Tobiko Plugin job.
|
||||
@ -36,6 +35,8 @@
|
||||
vars:
|
||||
configure_swap_size: 8192
|
||||
devstack_localrc:
|
||||
LIBVIRT_TYPE: kvm
|
||||
LIBVIRT_CPU_MODE: host-passthrough
|
||||
GLANCE_ENABLE_QUOTAS: false
|
||||
NETWORK_API_EXTENSIONS: >-
|
||||
address-scope,agent,allowed-address-pairs,auto-allocated-topology,
|
||||
|
@ -1,24 +1,14 @@
|
||||
---
|
||||
|
||||
- nodeset:
|
||||
name: devstack-tobiko-focal
|
||||
nodes:
|
||||
- name: controller
|
||||
# label: ubuntu-focal
|
||||
label: nested-virt-ubuntu-focal
|
||||
groups: &STANDALONE_GROUPS
|
||||
- name: tempest
|
||||
nodes:
|
||||
- controller
|
||||
|
||||
|
||||
- nodeset:
|
||||
name: devstack-tobiko-jammy
|
||||
nodes:
|
||||
- name: controller
|
||||
# label: ubuntu-jammy
|
||||
label: nested-virt-ubuntu-jammy
|
||||
groups: *STANDALONE_GROUPS
|
||||
groups: &STANDALONE_GROUPS
|
||||
- name: tempest
|
||||
nodes:
|
||||
- controller
|
||||
|
||||
|
||||
- nodeset:
|
||||
@ -35,11 +25,11 @@
|
||||
name: devstack-tobiko-multinode
|
||||
nodes:
|
||||
- name: controller
|
||||
label: ubuntu-focal
|
||||
label: ubuntu-jammy
|
||||
- name: compute1
|
||||
label: ubuntu-focal
|
||||
label: ubuntu-jammy
|
||||
- name: compute2
|
||||
label: ubuntu-focal
|
||||
label: ubuntu-jammy
|
||||
groups: &MULTINODE_GROUPS
|
||||
# Node where tests are executed and test results collected
|
||||
- name: tempest
|
||||
|
Loading…
Reference in New Issue
Block a user