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 <[email protected]> Change-Id: I46bf7fa6acf29da41ed313252aa54a64c6b24ab1
oVirt · Feb 16, 2023 · 300dee3 · 300dee3
1 parent 9431f54
commit 300dee3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -35,14 +35,18 @@ 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 \
         && \
         cp -rf $NMSTATE_WORKSPACE $NMSTATE_TMP/ \
         && \
         cd $NMSTATE_TMP/nmstate \
         && \
-        pip3 install --no-deps -U . \
+        $BUILD_NMSTATE \
         && \
         cd -
     "