Skip to content

Commit 300dee3

Browse files
committed
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
1 parent 9431f54 commit 300dee3

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.github/workflows/network.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
type: [ unit, integration, functional ]
33-
tag: [ alma-9, centos-8 ]
34-
include:
35-
- type: unit
36-
tag: centos-9
37-
- type: integration
38-
tag: centos-9
33+
tag: [ centos-8, centos-9 ]
3934
steps:
4035
- uses: ovirt/checkout-action@main
4136
- name: Install dependencies

tests/network/functional/run-tests.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,18 @@ function replace_resolvconf {
3535
}
3636

3737
function install_nmstate_from_source {
38+
BUILD_NMSTATE = "make rpm"
39+
if grep -q "8" <<< $IMAGE_TAG ; then
40+
BUILD_NMSTATE = "pip3 install --no-deps -U ."
41+
fi
3842
container_exec "
3943
mkdir $NMSTATE_TMP \
4044
&& \
4145
cp -rf $NMSTATE_WORKSPACE $NMSTATE_TMP/ \
4246
&& \
4347
cd $NMSTATE_TMP/nmstate \
4448
&& \
45-
pip3 install --no-deps -U . \
49+
$BUILD_NMSTATE \
4650
&& \
4751
cd -
4852
"

0 commit comments

Comments
 (0)