diff --git a/devstack/lib/ironic b/devstack/lib/ironic index db3fb5b61b..de5c227045 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -3349,6 +3349,18 @@ function setup_vxlan_network { 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 $_XTRACE_IRONIC $_PIPEFAIL_IRONIC diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 306569f514..b85b5bdfd8 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -21,6 +21,7 @@ if is_service_enabled ir-api ir-cond; then install_ironic install_ironicclient cleanup_ironic_config_files + downgrade_dnsmasq elif [[ "$2" == "post-config" ]]; then # stack/post-config - Called after the layer 1 and 2 services have been diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 337261b012..f084e8ddcb 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -106,7 +106,6 @@ Test ironic standalone configured with ipmi hardware type, ramdisk and direct deploy interfaces, rescue enabled. parent: ironic-base - nodeset: openstack-single-node-focal irrelevant-files: - ^.*\.rst$ - ^api-ref/.*$ @@ -160,7 +159,6 @@ - job: name: ironic-standalone-redfish parent: ironic-base - nodeset: openstack-single-node-focal description: Test ironic standalone configured with redfish hardware type, ansible and direct and ansible deploy interfaces, rescue it's not enabled.