test

almusil · Aug 21, 2023 · 170aaec · 170aaec
1 parent 5d4b803
commit 170aaec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 136 deletions.
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
@@ -122,7 +122,7 @@ function execute_system_tests()
 
       configure_ovn $OPTS
       make $JOBS || { cat config.log; exit 1; }
-      if ! sudo make $JOBS $type TESTSUITEFLAGS="$TEST_RANGE" RECHECK=yes; then
+      if ! sudo make $JOBS $type TESTSUITEFLAGS="$TEST_RANGE"; then
           # $log_file is necessary for debugging.
           cat tests/$log_file
           exit 1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -100,32 +100,7 @@ jobs:
       fail-fast: false
       matrix:
         cfg:
-        - { compiler: gcc, opts: --disable-ssl }
-        - { compiler: clang, opts: --disable-ssl }
-        - { compiler: gcc, testsuite: test, test_range: "-500" }
-        - { compiler: gcc, testsuite: test, test_range: "501-1000" }
-        - { compiler: gcc, testsuite: test, test_range: "1001-" }
-        - { compiler: clang, testsuite: test, sanitizers: sanitizers, test_range: "-300" }
-        - { compiler: clang, testsuite: test, sanitizers: sanitizers, test_range: "301-600" }
-        - { compiler: clang, testsuite: test, sanitizers: sanitizers, test_range: "601-900" }
-        - { compiler: clang, testsuite: test, sanitizers: sanitizers, test_range: "901-1200" }
-        - { compiler: clang, testsuite: test, sanitizers: sanitizers, test_range: "1201-" }
-        - { compiler: gcc, testsuite: test, libs: -ljemalloc, test_range: "-500" }
-        - { compiler: gcc, testsuite: test, libs: -ljemalloc, test_range: "501-1000" }
-        - { compiler: gcc, testsuite: test, libs: -ljemalloc, test_range: "1001-" }
-        - { compiler: gcc, testsuite: system-test-dpdk, dpdk: dpdk, test_range: "-100" }
-        - { compiler: gcc, testsuite: system-test-dpdk, dpdk: dpdk, test_range: "101-200" }
-        - { compiler: gcc, testsuite: system-test-dpdk, dpdk: dpdk, test_range: "201-" }
-        - { compiler: gcc, testsuite: system-test-userspace, test_range: "-100" }
-        - { compiler: gcc, testsuite: system-test-userspace, test_range: "101-200" }
-        - { compiler: gcc, testsuite: system-test-userspace, test_range: "201-" }
-        - { compiler: gcc, testsuite: system-test, test_range: "-100" }
-        - { compiler: gcc, testsuite: system-test, test_range: "101-200" }
-        - { compiler: gcc, testsuite: system-test, test_range: "201-" }
-        - { compiler: clang, testsuite: system-test, sanitizers: sanitizers, test_range: "-100" }
-        - { compiler: clang, testsuite: system-test, sanitizers: sanitizers, test_range: "101-200" }
-        - { compiler: clang, testsuite: system-test, sanitizers: sanitizers, test_range: "201-" }
-        - { arch: x86, compiler: gcc, opts: --disable-ssl }
+        - { compiler: gcc, testsuite: system-test-dpdk, dpdk: dpdk, test_range: "301-304" }
 
     steps:
     - name: checkout
@@ -178,111 +153,3 @@ jobs:
       with:
         name: logs-linux-${{ join(matrix.cfg.*, '-') }}
         path: logs.tgz
-
-  build-osx:
-    env:
-      CC:    clang
-      OPTS:  --disable-ssl
-
-    name:    osx clang --disable-ssl
-    runs-on: macos-latest
-
-    strategy:
-      fail-fast: false
-
-    steps:
-    - name: checkout
-      if: github.event_name == 'push' || github.event_name == 'pull_request'
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    # For weekly runs, don't update submodules
-    - name: checkout without submodule
-      if: github.event_name == 'schedule'
-      uses: actions/checkout@v3
-    # Weekly runs test using the tip of the most recent stable OVS branch
-    # instead of the submodule.
-    - name: checkout OVS
-      if: github.event_name == 'schedule'
-      uses: actions/checkout@v3
-      with:
-        repository: 'openvswitch/ovs'
-        fetch-depth: 0
-        path: 'ovs'
-    - name: checkout OVS most recent stable branch.
-      if: github.event_name == 'schedule'
-      run: |
-        git checkout \
-          $(git branch -a -l '*branch-*' | sed 's/remotes\/origin\///' | \
-            sort -V | tail -1)
-      working-directory: ovs
-    - name: install dependencies
-      run:  brew install automake libtool
-    - name: update PATH
-      run:  |
-        echo "$HOME/bin"        >> $GITHUB_PATH
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-    - name: set up python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    - name: prepare
-      run:  ./.ci/osx-prepare.sh
-    - name: build
-      run:  ./.ci/osx-build.sh
-    - name: upload logs on failure
-      if: failure()
-      uses: actions/upload-artifact@v3
-      with:
-        name: logs-osx-clang---disable-ssl
-        path: config.log
-
-  build-linux-rpm:
-    name: linux rpm fedora
-    runs-on: ubuntu-latest
-    container: fedora:latest
-    timeout-minutes: 30
-
-    strategy:
-      fail-fast: false
-
-    steps:
-      - name: install dependencies
-        run: dnf install -y dnf-plugins-core git rpm-build
-
-      - name: checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: install build dependencies
-        run: |
-          sed -e 's/@VERSION@/0.0.1/' rhel/ovn-fedora.spec.in \
-          > /tmp/ovn.spec
-          dnf builddep -y /tmp/ovn.spec
-
-      - name: configure OvS
-        run: ./boot.sh && ./configure
-        working-directory: ovs
-
-      - name: make dist OvS
-        run: make dist
-        working-directory: ovs
-
-      - name: configure OVN
-        run:  ./boot.sh && ./configure
-
-      - name: make dist OVN
-        run: make dist
-
-      - name: build RPM
-        run:  make rpm-fedora
-
-      - name: upload rpm packages
-        uses: actions/upload-artifact@v3
-        with:
-          name: rpm-packages
-          path: |
-            rpm/rpmbuild/SRPMS/*.rpm
-            rpm/rpmbuild/RPMS/*/*.rpm
-          retention-days: 14
diff --git a/ovs b/ovs