chore(merge): release-2.9 branch to master (#11776)

* fix(e2e): loosen up assertion on traffic route test (#11764) * fix(e2e): loosen up assertion on traffic route test Signed-off-by: Marcin Skalski <[email protected]> --------- Signed-off-by: Marcin Skalski <[email protected]> * ci(github): downgrade github action runner from ubuntu-latest to ubuntu-22.04 for images building (#11783) Signed-off-by: Icarus Wu <[email protected]> --------- Signed-off-by: Marcin Skalski <[email protected]> Signed-off-by: Icarus Wu <[email protected]> Signed-off-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com> Co-authored-by: Marcin Skalski <[email protected]> Co-authored-by: Icarus Wu <[email protected]> Co-authored-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
kumahq · Oct 16, 2024 · ac7d92c · ac7d92c
1 parent c623d09
commit ac7d92c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/_build_publish.yaml b/.github/workflows/_build_publish.yaml
@@ -88,7 +88,7 @@ jobs:
         run: |
           make publish/pulp
   build-images:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04 # pining to this version until https://github.com/actions/runner-images/issues/10636#issuecomment-2397720931 has a better solution
     timeout-minutes: 30
     strategy:
       fail-fast: false

diff --git a/test/e2e_env/universal/trafficroute/traffic_route.go b/test/e2e_env/universal/trafficroute/traffic_route.go
@@ -402,7 +402,7 @@ conf:
 				Should(And(
 					HaveLen(2),
 					HaveKey(`echo-v3`),
-					HaveKeyWithValue(`echo-v4`, BeNumerically("~", 80, 10)),
+					HaveKeyWithValue(`echo-v4`, BeNumerically("~", 80, 20)),
 				))
 		})