Dockerfile.base: Pre-release test for openvswitch3.4-3.4.2-66.el9fdp

Signed-off-by: Ilya Maximets <[email protected]>

Author: Ilya Maximets

Dockerfile.base

@@ -27,10 +27,10 @@ RUN INSTALL_PKGS="iptables nftables" && \
 	ovsver_short=$(echo "$ovsver" | cut -d'.' -f1,2) && \
 	ovnver_short=$(echo "$ovnver" | cut -d'.' -f1,2) && \
 	dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs $INSTALL_PKGS && \
-	dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "openvswitch$ovsver_short = $ovsver" "python3-openvswitch$ovsver_short = $ovsver" && \
+	dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "openvswitch$ovsver_short" "python3-openvswitch$ovsver_short" && \
 	dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "ovn$ovnver_short = $ovnver" "ovn$ovnver_short-central = $ovnver" "ovn$ovnver_short-host = $ovnver" && \
 	dnf clean all && rm -rf /var/cache/* && \
-	sed 's/%/"/g' <<<"%openvswitch$ovsver_short-devel = $ovsver% %openvswitch$ovsver_short-ipsec = $ovsver% %ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs
+	sed 's/%/"/g' <<<"%openvswitch$ovsver_short-devel% %openvswitch$ovsver_short-ipsec% %ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs
 
 RUN mkdir -p /var/run/openvswitch && \
     mkdir -p /var/run/ovn && \
@@ -47,5 +47,12 @@ COPY .git/refs/heads/ /root/.git/refs/heads/
 # variables to direct operation and configure ovn
 COPY dist/images/ovnkube.sh /root/
 
+# Copy and install custom OVS/OVN RPMs.
+RUN mkdir -p /root/fdp/
+COPY *fdp.*.rpm /root/fdp/
+RUN dnf install -y 'dnf-command(versionlock)'
+RUN dnf install -y /root/fdp/*.rpm
+RUN dnf versionlock add python3-openvswitch* openvswitch* ovn*
+
 WORKDIR /root
 ENTRYPOINT /root/ovnkube.sh