From 7a40d44d0a18ddc4fac73b1373f834a3feb1636f Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Dec 13 2024 10:56:36 +0000
Subject: Import openvswitch3.3-3.3.0-70 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index c4119a1..7426b9c 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -69,7 +69,7 @@ index d8a9722809..9f0fbfe40d 100644
      matrix:
        COMPILER: gcc
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
-index fc75581486..6c37a1d244 100644
+index fc75581486..e75cb54d58 100644
 --- a/.github/workflows/build-and-test.yml
 +++ b/.github/workflows/build-and-test.yml
 @@ -2,17 +2,23 @@ name: Build and Test
@@ -228,7 +228,12 @@ index fc75581486..6c37a1d244 100644
      - name: install libunbound libunwind python3-unbound
        # GitHub Actions doesn't have 32-bit versions of these libraries.
        if:   matrix.m32 == ''
-@@ -268,13 +336,13 @@ jobs:
+@@ -264,17 +332,20 @@ jobs:
+         name: logs-linux-${{ join(matrix.*, '-') }}
+         path: logs.tgz
+ 
+-  build-clang-analyze:
++  build-clang-analyze-cache:
      needs: build-dpdk
      env:
        dependencies: |
@@ -239,22 +244,109 @@ index fc75581486..6c37a1d244 100644
        CC:   clang
        DPDK: dpdk
        CLANG_ANALYZE: true
-     name: clang-analyze
+-    name: clang-analyze
 -    runs-on: ubuntu-22.04
++    name: clang-analyze-cache
++    outputs:
++      key: ${{ steps.cache_key.outputs.key }}
++      outcome: ${{ steps.build_base.outcome }}
 +    runs-on: ubuntu-24.04
      timeout-minutes: 30
  
      steps:
-@@ -346,7 +414,7 @@ jobs:
+@@ -344,35 +415,86 @@ jobs:
+         key:  ${{ steps.cache_key.outputs.key }}
+ 
      - name: set up python
++      if: steps.clang_cache.outputs.cache-hit != 'true'
        uses: actions/setup-python@v5
        with:
 -        python-version: '3.9'
 +        python-version: ${{ env.python_default }}
  
      - name: get cached dpdk-dir
++      if: steps.clang_cache.outputs.cache-hit != 'true'
        uses: actions/cache/restore@v4
-@@ -399,7 +467,7 @@ jobs:
+       with:
+         path: dpdk-dir
+         key:  ${{ needs.build-dpdk.outputs.dpdk_key }}
+ 
+     - name: update APT cache
++      if: steps.clang_cache.outputs.cache-hit != 'true'
+       run:  sudo apt update || true
+ 
+     - name: install common dependencies
++      if: steps.clang_cache.outputs.cache-hit != 'true'
+       run:  sudo apt install -y ${{ env.dependencies }}
+ 
+     - name: prepare
++      if: steps.clang_cache.outputs.cache-hit != 'true'
+       run:  ./.ci/linux-prepare.sh
+ 
+     - name: build base reference
++      id: build_base
+       if: steps.clang_cache.outputs.cache-hit != 'true'
++      continue-on-error: true
+       run:  ./.ci/linux-build.sh
+ 
+-    - name: save cache
+-      uses: actions/cache/save@v4
+-      if: steps.clang_cache.outputs.cache-hit != 'true'
++  build-clang-analyze:
++    needs: [build-dpdk, build-clang-analyze-cache]
++    if: >
++        needs.build-clang-analyze-cache.outputs.outcome == 'success' ||
++        needs.build-clang-analyze-cache.outputs.outcome == 'skipped'
++    env:
++      dependencies: |
++        automake bc clang-tools libnuma-dev libunbound-dev libunwind-dev \
++        libssl-dev libtool libxdp-dev llvm-dev
++      CC:   clang
++      DPDK: dpdk
++      CLANG_ANALYZE: true
++    name: clang-analyze
++    runs-on: ubuntu-24.04
++    timeout-minutes: 30
++
++    steps:
++    - name: checkout
++      uses: actions/checkout@v4
++
++    - name: update PATH
++      run: |
++        echo "$HOME/bin"        >> $GITHUB_PATH
++        echo "$HOME/.local/bin" >> $GITHUB_PATH
++
++    - name: check for analyzer result cache
++      uses: actions/cache/restore@v4
+       with:
+         path: base-clang-analyzer-results
+-        key:  ${{ steps.cache_key.outputs.key }}
++        key:  ${{ needs.build-clang-analyze-cache.outputs.key }}
++
++    - name: set up python
++      uses: actions/setup-python@v5
++      with:
++        python-version: ${{ env.python_default }}
++
++    - name: get cached dpdk-dir
++      uses: actions/cache/restore@v4
++      with:
++        path: dpdk-dir
++        key:  ${{ needs.build-dpdk.outputs.dpdk_key }}
++
++    - name: update APT cache
++      run:  sudo apt update || true
++
++    - name: install common dependencies
++      run:  sudo apt install -y ${{ env.dependencies }}
++
++    - name: prepare
++      run:  ./.ci/linux-prepare.sh
+ 
+     - name: build
+       run:  ./.ci/linux-build.sh
+@@ -399,7 +521,7 @@ jobs:
      - name: set up python
        uses: actions/setup-python@v5
        with:
@@ -263,7 +355,7 @@ index fc75581486..6c37a1d244 100644
      - name: install dependencies
        run:  brew install automake libtool
      - name: prepare
-@@ -421,7 +489,7 @@ jobs:
+@@ -421,7 +543,7 @@ jobs:
        DPDK:        ${{ matrix.dpdk }}
  
      name: linux deb ${{ matrix.dpdk }} dpdk
diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec
index c81c5fc..cca1c0e 100644
--- a/SPECS/openvswitch3.3.spec
+++ b/SPECS/openvswitch3.3.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.3.0
-Release: 69%{?dist}
+Release: 70%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -769,6 +769,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Dec 13 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-70
+- Merging upstream branch-3.3 [RH git: fd9966b496]
+    Commit list:
+    89bc5dbd60 github: Skip clang-analyze when reference generation fails.
+
+
 * Thu Dec 12 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-69
 - Merging upstream branch-3.3 [RH git: c7cf50c507]
     Commit list: