Merge pull request #90 from igsilya/ubuntu-24.04

Fix ubuntu image build on 24.04 + fix tests on latest fedora.
ovn-org · Aug 5, 2024 · 9884f0a · 9884f0a
2 parents 7cb884a + e6022a2
commit 9884f0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.ci/test_basic.sh b/.ci/test_basic.sh
@@ -36,8 +36,10 @@ $PODMAN_BIN exec -it ovn-gw-1 ping -c 1 -w 1 170.168.0.5
 $PODMAN_BIN exec -it ovn-chassis-1 ip netns
 
 # sw01p1 : dual stack
-$PODMAN_BIN exec -it ovn-chassis-1 ip netns exec sw01p1 ip -4 route > sw01p1_route
-$PODMAN_BIN exec -it ovn-chassis-1 ip netns exec sw01p1 ip -6 route >> sw01p1_route
+$PODMAN_BIN exec -it ovn-chassis-1 \
+    ip netns exec sw01p1 ip --color=never -4 route > sw01p1_route
+$PODMAN_BIN exec -it ovn-chassis-1 \
+    ip netns exec sw01p1 ip --color=never -6 route >> sw01p1_route
 cat sw01p1_route
 grep "11.0.0.0/24 dev sw01p1" sw01p1_route
 grep "default via 11.0.0.1 dev sw01p1" sw01p1_route

diff --git a/image/cinc/install_ubuntu_pkg.sh b/image/cinc/install_ubuntu_pkg.sh
@@ -41,7 +41,7 @@ apt install -yq --no-install-recommends \
   python3-pip \
   python3-psutil \
   python3-six \
-  resource-agents \
+  resource-agents* \
   tcpdump \
   uuid