From b5be6e93bc3c7456765f942aabeefdeade3b400c Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 14 2022 02:14:29 +0000 Subject: Import openvswitch2.13-2.13.0-206 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 89b612b..731c2fe 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -375,7 +375,7 @@ index 1b32f55d65..b4ce3cde16 100644 - ./boot.sh diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml new file mode 100644 -index 0000000000..9b951a07d0 +index 0000000000..4231fddde7 --- /dev/null +++ b/.github/workflows/build-and-test.yml @@ -0,0 +1,206 @@ @@ -486,7 +486,7 @@ index 0000000000..9b951a07d0 + + steps: + - name: checkout -+ uses: actions/checkout@v2 ++ uses: actions/checkout@v3 + + - name: fix up /etc/hosts + # https://github.com/actions/virtual-environments/issues/3353 @@ -506,7 +506,7 @@ index 0000000000..9b951a07d0 + + - 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') }} @@ -534,7 +534,7 @@ index 0000000000..9b951a07d0 + + - 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' @@ -553,7 +553,7 @@ index 0000000000..9b951a07d0 + + - 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 @@ -572,7 +572,7 @@ index 0000000000..9b951a07d0 + + steps: + - name: checkout -+ uses: actions/checkout@v2 ++ uses: actions/checkout@v3 + - name: install dependencies + run: brew install automake libtool + - name: prepare @@ -581,7 +581,7 @@ index 0000000000..9b951a07d0 + run: PATH="$PATH:$HOME/bin" ./.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/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 5e8b35b..1ff6449 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 205%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 206%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -715,6 +715,12 @@ exit 0 %endif %changelog +* Thu Oct 13 2022 Open vSwitch CI - 2.13.0-206 +- Merging upstream branch-2.13 [RH git: 1634691a83] + Commit list: + 730ab63adb github: Update versions of action dependencies. + + * Fri Oct 07 2022 Open vSwitch CI - 2.13.0-205 - Merging upstream branch-2.13 [RH git: 6fa229d68f] Commit list: