From 2499757f75d708d0613b789d60ec6c2ab9e9a43b Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 13 2022 22:10:50 +0000 Subject: Import openvswitch2.17-2.17.0-50 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index c570a67..7697c6c 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -38,7 +38,7 @@ index a7ae793bc4..29be50029b 100644 memory: 4G diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index eac3504e48..6c9dddbb59 100644 +index eac3504e48..6ccab8e908 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -6,7 +6,7 @@ jobs: @@ -59,6 +59,76 @@ index eac3504e48..6c9dddbb59 100644 timeout-minutes: 30 strategy: +@@ -111,7 +111,7 @@ jobs: + + steps: + - name: checkout +- uses: actions/checkout@v2 ++ uses: actions/checkout@v3 + + - name: update PATH + run: | +@@ -119,7 +119,7 @@ jobs: + echo "$HOME/.local/bin" >> $GITHUB_PATH + + - name: set up python +- uses: actions/setup-python@v2 ++ uses: actions/setup-python@v4 + with: + python-version: '3.9' + +@@ -135,7 +135,7 @@ jobs: + + - name: cache + if: matrix.dpdk != '' || matrix.dpdk_shared != '' +- uses: actions/cache@v2 ++ uses: actions/cache@v3 + env: + matrix_key: ${{ matrix.dpdk }}${{ matrix.dpdk_shared }} + ci_key: ${{ hashFiles('dpdk-ci-signature') }} +@@ -163,7 +163,7 @@ jobs: + + - name: upload deb packages + if: matrix.deb_package != '' +- uses: actions/upload-artifact@v2 ++ uses: actions/upload-artifact@v3 + with: + name: deb-packages + path: '/home/runner/work/ovs/*.deb' +@@ -182,7 +182,7 @@ jobs: + + - name: upload logs on failure + if: failure() || cancelled() +- uses: actions/upload-artifact@v2 ++ uses: actions/upload-artifact@v3 + with: + name: logs-linux-${{ join(matrix.*, '-') }} + path: logs.tgz +@@ -201,13 +201,13 @@ jobs: + + steps: + - name: checkout +- uses: actions/checkout@v2 ++ uses: actions/checkout@v3 + - name: update PATH + run: | + echo "$HOME/bin" >> $GITHUB_PATH + echo "$HOME/.local/bin" >> $GITHUB_PATH + - name: set up python +- uses: actions/setup-python@v2 ++ uses: actions/setup-python@v4 + with: + python-version: '3.9' + - name: install dependencies +@@ -218,7 +218,7 @@ jobs: + run: ./.ci/osx-build.sh + - name: upload logs on failure + if: failure() +- uses: actions/upload-artifact@v2 ++ uses: actions/upload-artifact@v3 + with: + name: logs-osx-clang---disable-ssl + path: config.log diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst index af524251ff..49895c595f 100644 --- a/Documentation/faq/releases.rst diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index b242193..34d1197 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 49%{?dist} +Release: 50%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -748,6 +748,12 @@ exit 0 %endif %changelog +* Thu Oct 13 2022 Open vSwitch CI - 2.17.0-50 +- Merging upstream branch-2.17 [RH git: de74ee2fd8] + Commit list: + 5e26f88b4f github: Update versions of action dependencies. + + * Tue Oct 11 2022 Open vSwitch CI - 2.17.0-49 - Merging upstream branch-2.17 [RH git: b62483b493] Commit list: