From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Wed, 30 Nov 2022 00:54:14 +0000 (+0000)
Subject: ci: seperate local and network tests
X-Git-Tag: 058~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43c16bfac477121dc35a61163251ebeacc694f52;p=thirdparty%2Fdracut.git

ci: seperate local and network tests

Configure network module outside of test.sh scripts
to allow for parallelizm and flexibility.

Remove NM test directory wrappers and set network
in Github action instead.

This is in preparation to test other dracut network modules
such as systemd-networkd dracut module.
---

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 159f6636c..e617ec2c9 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -60,18 +60,45 @@ jobs:
                         "15",
                         "16",
                         "17",
+                        "62",
+                        "98",
+                ]
+            fail-fast: false
+        container:
+            image: ghcr.io/dracutdevs/${{ matrix.container }}
+            options: "--privileged -v /dev:/dev"
+        steps:
+            -   name: "Checkout Repository"
+                uses: actions/checkout@v3
+                with:
+                    fetch-depth: 0
+
+            -   name: "${{ matrix.container }} TEST-${{ matrix.test }}"
+                run: ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
+    network:
+        runs-on: ubuntu-latest
+        timeout-minutes: 45
+        concurrency:
+            group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.container }}-${{ matrix.test }}-${{ matrix.network }}
+            cancel-in-progress: true
+        strategy:
+            matrix:
+                container: [
+                        "fedora:latest",
+                ]
+                network: [
+                        "network-manager",
+                        "network-legacy",
+                        #"systemd-networkd",
+                        #"network-wicked",
+                        #"connman",
+                ]
+                test: [
                         "20",
-                        "21",
                         "30",
-                        "31",
                         "35",
-                        "36",
                         "40",
-                        "41",
                         "50",
-                        "51",
-                        "62",
-                        "98",
                 ]
             fail-fast: false
         container:
@@ -84,7 +111,7 @@ jobs:
                     fetch-depth: 0
 
             -   name: "${{ matrix.container }} TEST-${{ matrix.test }}"
-                run: ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
+                run: USE_NETWORK=${{ matrix.network }} ./tools/test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
     openrc-musl:
         runs-on: ubuntu-latest
         timeout-minutes: 45
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 5d3ab147b..1ecf7f630 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if [[ $NM ]]; then
-    USE_NETWORK="network-manager"
-else
-    USE_NETWORK="network-legacy"
-fi
+[ -z "$USE_NETWORK" ] && USE_NETWORK="network-legacy"
 
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="root filesystem on NFS with $USE_NETWORK"
diff --git a/test/TEST-21-NFS-NM/Makefile b/test/TEST-21-NFS-NM/Makefile
deleted file mode 100644
index b19122a1d..000000000
--- a/test/TEST-21-NFS-NM/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: all setup clean run
-
-BASETEST=../TEST-20-NFS
-
-all:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) all
-setup:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) setup
-clean:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) clean
-run:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) run
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index 99e57a323..3c0e84c15 100755
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if [[ $NM ]]; then
-    USE_NETWORK="network-manager"
-else
-    USE_NETWORK="network-legacy"
-fi
+[ -z "$USE_NETWORK" ] && USE_NETWORK="network-legacy"
 
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="root filesystem over iSCSI with $USE_NETWORK"
diff --git a/test/TEST-31-ISCSI-NM/Makefile b/test/TEST-31-ISCSI-NM/Makefile
deleted file mode 100644
index 848844435..000000000
--- a/test/TEST-31-ISCSI-NM/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: all setup clean run
-
-BASETEST=../TEST-30-ISCSI
-
-all:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) all
-setup:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) setup
-clean:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) clean
-run:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) run
diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh
index f11b24acf..b0d971f02 100755
--- a/test/TEST-35-ISCSI-MULTI/test.sh
+++ b/test/TEST-35-ISCSI-MULTI/test.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if [[ $NM ]]; then
-    USE_NETWORK="network-manager"
-else
-    USE_NETWORK="network-legacy"
-fi
+[ -z "$USE_NETWORK" ] && USE_NETWORK="network-legacy"
 
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="root filesystem over multiple iSCSI with $USE_NETWORK"
diff --git a/test/TEST-36-ISCSI-MULTI-NM/Makefile b/test/TEST-36-ISCSI-MULTI-NM/Makefile
deleted file mode 100644
index 8b8a77add..000000000
--- a/test/TEST-36-ISCSI-MULTI-NM/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: all setup clean run
-
-BASETEST=../TEST-35-ISCSI-MULTI
-
-all:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) all
-setup:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) setup
-clean:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) clean
-run:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) run
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 54ba5982c..9b90a82e1 100755
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if [[ $NM ]]; then
-    USE_NETWORK="network-manager"
-else
-    USE_NETWORK="network-legacy"
-fi
+[ -z "$USE_NETWORK" ] && USE_NETWORK="network-legacy"
 
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="root filesystem on NBD with $USE_NETWORK"
diff --git a/test/TEST-41-NBD-NM/Makefile b/test/TEST-41-NBD-NM/Makefile
deleted file mode 100644
index 47c90c31f..000000000
--- a/test/TEST-41-NBD-NM/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: all setup clean run
-
-BASETEST=../TEST-40-NBD
-
-all:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) all
-setup:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) setup
-clean:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) clean
-run:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) run
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index 5a47b096c..3dc8a812a 100755
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if [[ $NM ]]; then
-    USE_NETWORK="network-manager"
-else
-    USE_NETWORK="network-legacy"
-fi
+[ -z "$USE_NETWORK" ] && USE_NETWORK="network-legacy"
 
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="root filesystem on NFS with multiple nics with $USE_NETWORK"
diff --git a/test/TEST-51-MULTINIC-NM/Makefile b/test/TEST-51-MULTINIC-NM/Makefile
deleted file mode 100644
index 6c093fd5d..000000000
--- a/test/TEST-51-MULTINIC-NM/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: all setup clean run
-
-BASETEST=../TEST-50-MULTINIC
-
-all:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) all
-setup:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) setup
-clean:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) clean
-run:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) run
diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
index dc8dd62db..d61604e56 100755
--- a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
+++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
@@ -2,11 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-if [[ $NM ]]; then
-    USE_NETWORK="network-manager"
-else
-    USE_NETWORK="network-legacy"
-fi
+[ -z "$USE_NETWORK" ] && USE_NETWORK="network-legacy"
 
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="root filesystem on NFS with bridging/bonding/vlan with $USE_NETWORK"
diff --git a/test/TEST-61-BONDBRIDGEVLANIFCFG-NM/Makefile b/test/TEST-61-BONDBRIDGEVLANIFCFG-NM/Makefile
deleted file mode 100644
index f94ba3c52..000000000
--- a/test/TEST-61-BONDBRIDGEVLANIFCFG-NM/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: all setup clean run
-
-BASETEST=../TEST-60-BONDBRIDGEVLANIFCFG
-
-all:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) all
-setup:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) setup
-clean:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) clean
-run:
-	@$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) run