This removes the need for linux-prepare.sh so we can avoid some duplication of dependency management.
Suggested-by: Ales Musil <[email protected]> Signed-off-by: Dumitru Ceara <[email protected]> --- .ci/linux-build.sh | 3 ++- .ci/linux-prepare.sh | 21 --------------------- .github/workflows/ovn-fake-multinode-tests.yml | 16 ++++++++++------ Makefile.am | 1 - 4 files changed, 12 insertions(+), 29 deletions(-) delete mode 100755 .ci/linux-prepare.sh diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 138780ab14..907a0dc6c9 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -4,6 +4,7 @@ set -o errexit set -x ARCH=${ARCH:-"x86_64"} +USE_SPARSE=${USE_SPARSE:-"yes"} COMMON_CFLAGS="" OVN_CFLAGS="" OPTS="$OPTS --enable-Werror" @@ -27,7 +28,7 @@ function configure_ovn() function configure_gcc() { - if [ "$ARCH" = "x86_64" ]; then + if [ "$ARCH" = "x86_64" ] && [ "$USE_SPARSE" = "yes" ]; then # Enable sparse only for x86_64 architecture. OPTS="$OPTS --enable-sparse" elif [ "$ARCH" = "x86" ]; then diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh deleted file mode 100755 index 6617d0c42d..0000000000 --- a/.ci/linux-prepare.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -ev - -# Build and install sparse. -# -# Explicitly disable sparse support for llvm because some travis -# environments claim to have LLVM (llvm-config exists and works) but -# linking against it fails. -# Disabling sqlite support because sindex build fails and we don't -# really need this utility being installed. -git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git -cd sparse && make -j4 HAVE_LLVM= HAVE_SQLITE= install && cd .. - -# Installing wheel separately because it may be needed to build some -# of the packages during dependency backtracking and pip >= 22.0 will -# abort backtracking on build failures: -# https://github.com/pypa/pip/issues/10655 -pip3 install --disable-pip-version-check --user wheel -pip3 install --disable-pip-version-check --user \ --r utilities/containers/py-requirements.txt diff --git a/.github/workflows/ovn-fake-multinode-tests.yml b/.github/workflows/ovn-fake-multinode-tests.yml index 502bb2ff9c..6f6639540a 100644 --- a/.github/workflows/ovn-fake-multinode-tests.yml +++ b/.github/workflows/ovn-fake-multinode-tests.yml @@ -159,13 +159,16 @@ jobs: path: 'ovn' submodules: recursive - - name: Build OVN and trigger fake-multinode system tests + - name: Build OVN (for running fake-multinode system tests) + run: | + pip3 install --disable-pip-version-check --user wheel + pip3 install --disable-pip-version-check --user \ + -r utilities/containers/py-requirements.txt + USE_SPARSE=no ./.ci/linux-build.sh + working-directory: ovn + + - name: Run fake-multinode system tests run: | - set -x - pwd - cd ovn - ./.ci/linux-prepare.sh - ./.ci/linux-build.sh if ! sudo make check-multinode; then sudo podman exec -it ovn-central ovn-nbctl show || : sudo podman exec -it ovn-central ovn-sbctl show || : @@ -175,6 +178,7 @@ jobs: sudo cat tests/multinode-testsuite.log || : exit 1 fi + working-directory: ovn - name: copy logs on failure if: failure() || cancelled() diff --git a/Makefile.am b/Makefile.am index 7a56841e9d..f1bd72d943 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,6 @@ EXTRA_DIST = \ README.rst \ NOTICE \ .cirrus.yml \ - .ci/linux-prepare.sh \ .ci/ci.sh \ .ci/linux-build.sh \ .ci/osx-build.sh \ _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
