From 300dee3fdbc66a545fa8ca8fdeb0a0897b72b816 Mon Sep 17 00:00:00 2001
From: Eitan Raviv <eraviv@redhat.com>
Date: Tue, 14 Feb 2023 21:55:45 +0200
Subject: [PATCH] network: el9 tests - use make to build nmstate

Building nmstate from source for the tests requires using `make rpm`
instead of pip install for el9 and onwards.

Signed-off-by: Eitan Raviv <eraviv@redhat.com>
Change-Id: I46bf7fa6acf29da41ed313252aa54a64c6b24ab1
---
 .github/workflows/network.yml         | 7 +------
 tests/network/functional/run-tests.sh | 6 +++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/network.yml b/.github/workflows/network.yml
index b6bf3b2f68..e6b863c4c8 100644
--- a/.github/workflows/network.yml
+++ b/.github/workflows/network.yml
@@ -30,12 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         type: [ unit, integration, functional ]
-        tag: [ alma-9, centos-8 ]
-        include:
-          - type: unit
-            tag: centos-9
-          - type: integration
-            tag: centos-9
+        tag: [ centos-8, centos-9 ]
     steps:
       - uses: ovirt/checkout-action@main
       - name: Install dependencies
diff --git a/tests/network/functional/run-tests.sh b/tests/network/functional/run-tests.sh
index d014770143..7f65b6fcaf 100755
--- a/tests/network/functional/run-tests.sh
+++ b/tests/network/functional/run-tests.sh
@@ -35,6 +35,10 @@ function replace_resolvconf {
 }
 
 function install_nmstate_from_source {
+    BUILD_NMSTATE = "make rpm"
+    if grep -q "8" <<< $IMAGE_TAG ; then
+      BUILD_NMSTATE = "pip3 install --no-deps -U ."
+    fi
     container_exec "
         mkdir $NMSTATE_TMP \
         && \
@@ -42,7 +46,7 @@ function install_nmstate_from_source {
         && \
         cd $NMSTATE_TMP/nmstate \
         && \
-        pip3 install --no-deps -U . \
+        $BUILD_NMSTATE \
         && \
         cd -
     "