openstack/ironic
Code Issues Proposed changes

ci: Source install dnsmasq-2.87

Browse Source 
dnsmasq-2.86 shipped in Ubuntu jammy has a
known issue[1] which is fixed in dnsmasq-2.87
but it's not yet released with Ubuntu jammy.

Until fixed version is available in Ubuntu
jammy let's use source install instead of
using a older version from Ubuntu focal.

[1] https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2022q3/016562.html

Update from Julia:

Pushing forward the source fix again as ubuntu removed the
prior path we were using as a focal package and replaced
it with a package which is demonstrating the same basic issue.

Related-Bug: #2026757
Change-Id: I7ffcd167fc1e3a8c1192d766743bb5620d85ef35
This commit is contained in:
yatinkarel 2023-07-11 14:44:06 +05:30 committed by Julia Kreger
parent 50ced3a3fa
commit 27f53debb6
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devstack/lib/ironic
View File

@ -3421,15 +3421,16 @@ function setup_vxlan_network {
}
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
# NOTE(TheJulia): The intent here is to use dnsmasq version
# which have the fix for segfaults triggered due to configuration
# refresh https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/2026757
# Source install v2.87
sudo dpkg -r dnsmasq-base
git clone http://thekelleys.org.uk/git/dnsmasq.git -b v2.87 --depth 1
pushd dnsmasq
sed -i 's|^PREFIX.*|PREFIX = /usr|' Makefile
sudo make install
popd
}
# Restore xtrace + pipefail

8
zuul.d/project.yaml
View File

@ -21,7 +21,10 @@
# see also https://review.opendev.org/c/openstack/ironic-tempest-plugin/+/882312
- ironic-tempest-functional-rbac-scope-enforced:
voting: false
- ironic-grenade
# NOTE(TheJulia): Disabling grenade job on 20240227 from voting
# because we need to backport the same fix to the prior release branch.
- ironic-grenade:
voting: false
- ironic-grenade-skip-level:
voting: false
- ironic-standalone
@ -73,7 +76,8 @@
# NOTE(rpittau) disabled until we fix the tests
# see also https://review.opendev.org/c/openstack/ironic-tempest-plugin/+/882312
# - ironic-tempest-functional-rbac-scope-enforced
- ironic-grenade
# NOTE(TheJulia): Disabling until we get a dnsmasq handling fix backported.
# - ironic-grenade
- ironic-standalone
- ironic-standalone-redfish
- ironic-tempest-bios-redfish-pxe