On Mon, Mar 25, 2024 at 9:47 AM Dumitru Ceara <[email protected]> wrote:
> On 3/22/24 19:34, Mark Michelson wrote: > > On 3/21/24 19:15, Dumitru Ceara wrote: > >> Most of the steps were inaccurate. Instead, use latest Ubuntu, use > >> OVS from the submodule inside the OVN repo. > >> > >> Signed-off-by: Dumitru Ceara <[email protected]> > >> --- > >> utilities/docker/Makefile | 4 ++-- > >> utilities/docker/debian/Dockerfile | 2 +- > >> utilities/docker/debian/build.sh | 2 ++ > >> utilities/docker/install_ovn.sh | 31 ++++++++++++++---------------- > >> 4 files changed, 19 insertions(+), 20 deletions(-) > >> > >> diff --git a/utilities/docker/Makefile b/utilities/docker/Makefile > >> index 57e95651cb..aad9c3482c 100644 > >> --- a/utilities/docker/Makefile > >> +++ b/utilities/docker/Makefile > >> @@ -1,5 +1,5 @@ > >> -#export OVN_BRANCH=master > >> -#export OVN_VERSION=2.12 > >> +#export OVN_BRANCH=main > >> +#export OVN_VERSION=24.03.90 > > > > Is this something that we should update with each major release of OVN? > > If so, I could probably alter my release script to include updating > > utilities/docker/Makefile as part of the release patches. > > > > It's just a comment and I guess the original intention was to show users > how to set this up. But, back to your question, if it's not a lot of > work, automatically changing this on release would be nice. > > Also, it might make sense to set up a CI job that actually runs this in > CI, maybe periodically. I can try to find some time to do that at some > point in the future. Wdyt? > Hi Mark, Dumitru, from a different perspective, I would be interested to see if this is still used by anyone. We have other methods of running OVN in containers that are up to date and maintained. It might be the case of working perfectly, still used and doesn't need any attention. But it would probably still be useful to hear from the community if that's the case. IMO we shouldn't run CI on something just for the sake of running CI. Does that make sense? > > >> #export DISTRO=debian > >> #export GITHUB_SRC=https://github.com/ovn-org/ovn.git > >> #export DOCKER_REPO=ovn-org/ovn > >> diff --git a/utilities/docker/debian/Dockerfile > >> b/utilities/docker/debian/Dockerfile > >> index 366ad6d4f3..a89ef46c9f 100644 > >> --- a/utilities/docker/debian/Dockerfile > >> +++ b/utilities/docker/debian/Dockerfile > >> @@ -1,4 +1,4 @@ > >> -FROM ubuntu:16.04 > >> +FROM ubuntu:22.04 > >> MAINTAINER "Aliasgar Ginwala" <[email protected]> > >> ARG OVN_BRANCH > >> diff --git a/utilities/docker/debian/build.sh > >> b/utilities/docker/debian/build.sh > >> index 57ace5f505..6edb5b85e4 100755 > >> --- a/utilities/docker/debian/build.sh > >> +++ b/utilities/docker/debian/build.sh > >> @@ -12,6 +12,8 @@ > >> # See the License for the specific language governing permissions and > >> # limitations under the License. > >> +set -e > >> + > >> OVN_BRANCH=$1 > >> GITHUB_SRC=$2 > >> diff --git a/utilities/docker/install_ovn.sh > >> b/utilities/docker/install_ovn.sh > >> index 55c189aaee..5157da1497 100755 > >> --- a/utilities/docker/install_ovn.sh > >> +++ b/utilities/docker/install_ovn.sh > >> @@ -12,29 +12,26 @@ > >> # See the License for the specific language governing permissions and > >> # limitations under the License. > >> +set -e > >> + > >> OVN_BRANCH=$1 > >> GITHUB_SRC=$2 > >> -# get ovs source always from master as its needed as dependency > >> -mkdir /build; cd /build > >> -git clone --depth 1 -b master https://github.com/openvswitch/ovs.git > >> -cd ovs; > >> -mkdir _gcc; > >> +# Get ovn source. > >> +git clone --depth 1 -b $OVN_BRANCH $GITHUB_SRC > >> +cd ovn > >> -# build and install > >> +# Get OVS submodule, build and install OVS. > >> +git submodule update --init > >> +cd ovs > >> ./boot.sh > >> -cd _gcc > >> -../configure --localstatedir="/var" --sysconfdir="/etc" > >> --prefix="/usr" \ > >> +./configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" > \ > >> --enable-ssl > >> -cd ..; make -C _gcc install; cd .. > >> - > >> +make -j8 install > >> +cd .. > >> -# get ovn source > >> -git clone --depth 1 -b $OVN_BRANCH $GITHUB_SRC > >> -cd ovn > >> - > >> -# build and install > >> +# Build and install OVN. > >> ./boot.sh > >> ./configure --localstatedir="/var" --sysconfdir="/etc" > >> --prefix="/usr" \ > >> ---enable-ssl --with-ovs-source=/build/ovs/ > >> --with-ovs-build=/build/ovs/_gcc > >> -make -j8; make install > >> +--enable-ssl > >> +make -j8 install > > > > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > Thanks, Ales -- Ales Musil Senior Software Engineer - OVN Core Red Hat EMEA <https://www.redhat.com> [email protected] <https://red.ht/sig> _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
