stable only/ci: pin CI to dnsmasq 2.85/pin proliantutils

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.

Also explicitly pins proliantutils back to prevent newer proliantutils
pulling in lextudio-pysnmp instead of pysnmp.

This commit merges I3295c92fd7b7871ad351b94f4c6cf0f554279db0
and Ibe3274d7fabfd4f06af8aba1af0957fa36e8d217.

Change-Id: Ibe3274d7fabfd4f06af8aba1af0957fa36e8d217

devstack/lib/ironic

@@ -3247,6 +3247,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 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
 $_XTRACE_IRONIC
 $_PIPEFAIL_IRONIC

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

driver-requirements.txt

@@ -4,7 +4,11 @@
 # python projects they should package as optional dependencies for Ironic.
 
 # These are available on pypi
-proliantutils>=2.11.0
+
+# NOTE(TheJulia): Proliantutils 2.16.0 moves to pysnmp-lextudio
+# however that breaks on imports and with testing due to collission
+# with pysnmp.
+proliantutils>=2.11.0,<2.16.0
 pysnmp>=4.3.0,<5.0.0
 python-scciclient>=0.8.0,<0.11.0
 python-dracclient>=5.1.0,<7.0.0

zuul.d/project.yaml

@@ -52,7 +52,10 @@
             voting: false
     gate:
       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-standalone
         - ironic-standalone-redfish