Merge pull request #5369 from npinaeva/ovs-build

[OVN build] Fetch ovs package from the ovn submodule.

Author: npinaeva

dist/images/Dockerfile.fedora

@@ -24,14 +24,28 @@ ENV PYTHONDONTWRITEBYTECODE yes
 RUN INSTALL_PKGS="git rpm-build dnf-plugins-core" && \
     dnf install --best --refresh -y --setopt=tsflags=nodocs $INSTALL_PKGS
 
+# Clone OVN Source Code.
+ARG OVN_REPO=https://github.com/ovn-org/ovn.git
+ARG OVN_GITREF=main
+WORKDIR /root
+RUN mkdir ovn && pushd ovn && \
+    git init && \
+    git remote add origin $OVN_REPO && \
+    git fetch origin ${OVN_GITREF} --depth 1 && \
+    git reset --hard FETCH_HEAD && \
+    popd
+
 # Clone OVS Source Code.
 ARG OVS_REPO=https://github.com/openvswitch/ovs.git
-ARG OVS_GITREF=branch-*
+# OVS_GITREF can be set to a specific commit or branch, otherwise the version pinned by OVN will be used.
+ARG OVS_GITREF=""
 WORKDIR /root
-RUN mkdir ovs && pushd ovs && \
+RUN OVS_OVN_GITREF=$(cd ovn && git submodule status ovs|cut -c 2-|cut -d ' ' -f 1) && \
+    mkdir ovs && pushd ovs && \
     git init && \
     git remote add origin $OVS_REPO && \
-    git fetch $OVS_REPO $(git ls-remote origin "${OVS_GITREF}" | sort -V -k2 | tail -1 | awk '{print $1}') --depth 1 && \
+    OVS_GITREF="${OVS_GITREF:-$OVS_OVN_GITREF}" && \
+    git fetch $OVS_REPO ${OVS_GITREF} --depth 1 && \
     git reset --hard FETCH_HEAD && \
     echo "1" && \
     find rhel && \
@@ -48,16 +62,6 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*debug*
 RUN rm rpm/rpmbuild/RPMS/x86_64/*devel*
 RUN git log -n 1
 
-# Clone OVN Source Code.
-ARG OVN_REPO=https://github.com/ovn-org/ovn.git
-ARG OVN_GITREF=main
-WORKDIR /root
-RUN mkdir ovn && pushd ovn && \
-    git init && \
-    git remote add origin $OVN_REPO && \
-    git fetch origin ${OVN_GITREF} --depth 1 && \
-    git reset --hard FETCH_HEAD && \
-    popd
 
 # Build OVN rpms.
 WORKDIR /root/ovn/