[DNM] Testing improved ovs-monitor-ipsec

Dockerfile

@@ -50,6 +50,9 @@ RUN INSTALL_PKGS=" \
  eval "dnf install -y --nodocs $(cat /more-pkgs)" && \
  dnf clean all && rm -rf /var/cache/*
 
+COPY libreswan-4.9-5.el9_2.3.x86_64.rpm /root/
+RUN rpm -Uhv --nodeps --force /root/libreswan*.rpm
+
 COPY --from=builder /go/src/github.com/openshift/ovn-kubernetes/go-controller/_output/go/bin/ovnkube /usr/bin/
 COPY --from=builder /go/src/github.com/openshift/ovn-kubernetes/go-controller/_output/go/bin/ovnkube-identity /usr/bin/
 COPY --from=builder /go/src/github.com/openshift/ovn-kubernetes/go-controller/_output/go/bin/ovn-kube-util /usr/bin/

Dockerfile.base

@@ -15,17 +15,20 @@ RUN dnf install -y --nodocs \
 ARG ovsver=3.1.0-88.el9fdp
 ARG ovnver=23.09.4-16.el9fdp
 
+COPY openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm openvswitch3.1-devel-3.1.0-bug41551.137.el9fdp.x86_64.rpm openvswitch3.1-ipsec-3.1.0-bug41551.137.el9fdp.x86_64.rpm python3-openvswitch3.1-3.1.0-bug41551.137.el9fdp.x86_64.rpm /root/
+
 RUN INSTALL_PKGS="iptables" && \
  ovsver_short=$(echo "$ovsver" | cut -d'.' -f1,2) && \
  ovnver_short=$(echo "$ovnver" | cut -d'.' -f1,2) && \
  dnf install -y --nodocs $INSTALL_PKGS && \
  dnf install -y --nodocs "openvswitch$ovsver_short = $ovsver" "python3-openvswitch$ovsver_short = $ovsver" && \
+ rpm -Uhv --nodeps --force /root/openvswitch3.1*.rpm && \
  dnf install -y --nodocs "ovn$ovnver_short = $ovnver" "ovn$ovnver_short-central = $ovnver" "ovn$ovnver_short-host = $ovnver" && \
  dnf clean all && rm -rf /var/cache/*
 
 RUN ovsver_short=$(echo "$ovsver" | cut -d'.' -f1,2) && \
  ovnver_short=$(echo "$ovnver" | cut -d'.' -f1,2) && \
- sed 's/%/"/g' <<<"%openvswitch$ovsver_short-devel = $ovsver% %openvswitch$ovsver_short-ipsec = $ovsver% %ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs
+ sed 's/%/"/g' <<<"%ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs
 
 RUN mkdir -p /var/run/openvswitch && \
  mkdir -p /var/run/ovn && \