ci: pin CI to dnsmasq 2.85
A temporary path forward to increase CI stability, by pinning to what appears to be a "good working version" of upstream dnsmasq which does not crash fon us. Change-Id: I3295c92fd7b7871ad351b94f4c6cf0f554279db0 (cherry picked from commitf893c740d7
) (cherry picked from commitb32378e1cf
)
This commit is contained in:
parent
d278fdb6d2
commit
59800efd88
|
@ -3352,6 +3352,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 use dnsmasq version
|
||||||
|
# which does not crash on segfaults or sigabort when configuration
|
||||||
|
# is updated. See https://bugs.launchpad.net/ironic/+bug/2026757
|
||||||
|
sudo dpkg -r dnsmasq-base
|
||||||
|
git clone http://thekelleys.org.uk/git/dnsmasq.git -b v2.85 --depth 1
|
||||||
|
pushd dnsmasq
|
||||||
|
sed -i 's|^PREFIX.*|PREFIX = /usr|' Makefile
|
||||||
|
sudo make install
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
# Restore xtrace + pipefail
|
# Restore xtrace + pipefail
|
||||||
$_XTRACE_IRONIC
|
$_XTRACE_IRONIC
|
||||||
$_PIPEFAIL_IRONIC
|
$_PIPEFAIL_IRONIC
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -9,7 +9,11 @@
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- ironic-tox-unit-with-driver-libs
|
# NOTE(TheJulia): re-enable voting once
|
||||||
|
# https://review.opendev.org/c/openstack/ironic/+/910528
|
||||||
|
# has merged.
|
||||||
|
- ironic-tox-unit-with-driver-libs:
|
||||||
|
voting: false
|
||||||
- ironic-cross-sushy:
|
- ironic-cross-sushy:
|
||||||
voting: false
|
voting: false
|
||||||
- ironic-tempest-functional-python3
|
- ironic-tempest-functional-python3
|
||||||
|
@ -72,7 +76,10 @@
|
||||||
voting: false
|
voting: false
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- ironic-tox-unit-with-driver-libs
|
# NOTE(TheJulia): Return this to voting once
|
||||||
|
# https://review.opendev.org/c/openstack/ironic/+/910528
|
||||||
|
# or similar change to the branch has merged
|
||||||
|
#- ironic-tox-unit-with-driver-libs
|
||||||
- ironic-tempest-functional-python3
|
- ironic-tempest-functional-python3
|
||||||
# NOTE(JayF): This job is failing and is being fixed in master. It
|
# NOTE(JayF): This job is failing and is being fixed in master. It
|
||||||
# should be re-enabled in stable when it's re-enabled on master.
|
# should be re-enabled in stable when it's re-enabled on master.
|
||||||
|
|
Loading…
Reference in New Issue