openstack
/
ironic
Code Issues Proposed changes

Merge "CI: Use focal dnsmasq"

This commit is contained in:
Zuul 2023-07-11 09:08:41 +00:00 committed by Gerrit Code Review
parent 349b1f7c41 0a11855d3f
commit f5e33812bd
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/lib/ironic
View File

@ -3349,6 +3349,18 @@ function setup_vxlan_network {
sudo ovs-vsctl set interface phy-brbm-infra options:peer=phy-infra-brbm sudo ovs-vsctl set interface phy-brbm-infra options:peer=phy-infra-brbm
} }
function downgrade_dnsmasq {
# NOTE(TheJulia): The intent here is to downgrade dnsmasq to the version
# shipped with Ubuntu focal, so we can have stable CI.
# https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/2026757
wget http://archive.ubuntu.com/ubuntu/pool/main/d/dnsmasq/dnsmasq-base_2.80-1.1ubuntu1.7_amd64.deb
wget http://archive.ubuntu.com/ubuntu/pool/main/libi/libidn/libidn11_1.33-2.2ubuntu2_amd64.deb
wget http://archive.ubuntu.com/ubuntu/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2ubuntu0.2_amd64.deb
wget http://archive.ubuntu.com/ubuntu/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2ubuntu0.2_amd64.deb
sudo dpkg -i dnsmasq-base_2.80-1.1ubuntu1.7_amd64.deb libidn11_1.33-2.2ubuntu2_amd64.deb libhogweed5_3.5.1+really3.5.1-2ubuntu0.2_amd64.deb libnettle7_3.5.1+really3.5.1-2ubuntu0.2_amd64.deb || true
rm *.deb
}
# Restore xtrace + pipefail # Restore xtrace + pipefail
$_XTRACE_IRONIC $_XTRACE_IRONIC
$_PIPEFAIL_IRONIC $_PIPEFAIL_IRONIC

1
devstack/plugin.sh
View File

@ -21,6 +21,7 @@ if is_service_enabled ir-api ir-cond; then
install_ironic install_ironic
install_ironicclient install_ironicclient
cleanup_ironic_config_files cleanup_ironic_config_files
downgrade_dnsmasq
elif [[ "$2" == "post-config" ]]; then elif [[ "$2" == "post-config" ]]; then
# stack/post-config - Called after the layer 1 and 2 services have been # stack/post-config - Called after the layer 1 and 2 services have been

2
zuul.d/ironic-jobs.yaml
View File

@ -106,7 +106,6 @@
Test ironic standalone configured with ipmi hardware type, ramdisk and Test ironic standalone configured with ipmi hardware type, ramdisk and
direct deploy interfaces, rescue enabled. direct deploy interfaces, rescue enabled.
parent: ironic-base parent: ironic-base
nodeset: openstack-single-node-focal
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
@ -160,7 +159,6 @@
- job: - job:
name: ironic-standalone-redfish name: ironic-standalone-redfish
parent: ironic-base parent: ironic-base
nodeset: openstack-single-node-focal
description: description:
Test ironic standalone configured with redfish hardware type, ansible and Test ironic standalone configured with redfish hardware type, ansible and
direct and ansible deploy interfaces, rescue it's not enabled. direct and ansible deploy interfaces, rescue it's not enabled.