|
 |
a9f26f |
From 436135496469ec24be1fc6fbc03a39d2575c8686 Mon Sep 17 00:00:00 2001
|
|
|
a9f26f |
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
|
|
a9f26f |
Date: Sat, 13 Nov 2021 17:55:45 +0100
|
|
|
a9f26f |
Subject: [PATCH] ci: backport TEST-21-NFS-NM
|
|
|
a9f26f |
|
|
|
a9f26f |
Loosely cherry-picked from a3f73298f287e75810d6784efa52e80af15da2bd.
|
|
|
a9f26f |
|
|
|
a9f26f |
rhel-only
|
|
|
a9f26f |
---
|
|
|
a9f26f |
.github/workflows/integration.yml | 3 +--
|
|
|
a9f26f |
test/TEST-20-NFS/test.sh | 14 +++++++++++---
|
|
|
a9f26f |
test/TEST-21-NFS-NM/Makefile | 12 ++++++++++++
|
|
|
a9f26f |
3 files changed, 24 insertions(+), 5 deletions(-)
|
|
|
a9f26f |
|
|
|
a9f26f |
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
|
|
|
a9f26f |
index 80a856a2..9c7c8486 100644
|
|
|
a9f26f |
--- a/.github/workflows/integration.yml
|
|
|
a9f26f |
+++ b/.github/workflows/integration.yml
|
|
|
a9f26f |
@@ -29,9 +29,8 @@ jobs:
|
|
|
a9f26f |
"13",
|
|
|
a9f26f |
"17",
|
|
|
a9f26f |
"20",
|
|
|
a9f26f |
- #"21", needs backport (NFS + NM)
|
|
|
a9f26f |
+ "21",
|
|
|
a9f26f |
"40",
|
|
|
a9f26f |
- #"41", needws backport (NBD + NM)
|
|
|
a9f26f |
"98",
|
|
|
a9f26f |
]
|
|
|
a9f26f |
fail-fast: false
|
|
|
a9f26f |
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
|
|
|
a9f26f |
index 4ad7fd77..320f9c3e 100755
|
|
|
a9f26f |
--- a/test/TEST-20-NFS/test.sh
|
|
|
a9f26f |
+++ b/test/TEST-20-NFS/test.sh
|
|
|
a9f26f |
@@ -1,5 +1,13 @@
|
|
|
a9f26f |
#!/bin/bash
|
|
|
a9f26f |
-TEST_DESCRIPTION="root filesystem on NFS"
|
|
|
a9f26f |
+if [[ $NM ]]; then
|
|
|
a9f26f |
+ USE_NETWORK="network-manager"
|
|
|
a9f26f |
+ OMIT_NETWORK="network-legacy"
|
|
|
a9f26f |
+else
|
|
|
a9f26f |
+ USE_NETWORK="network-legacy"
|
|
|
a9f26f |
+ OMIT_NETWORK="network-manager"
|
|
|
a9f26f |
+fi
|
|
|
a9f26f |
+
|
|
|
a9f26f |
+TEST_DESCRIPTION="root filesystem on NFS with $USE_NETWORK"
|
|
|
a9f26f |
|
|
|
a9f26f |
KVERSION=${KVERSION-$(uname -r)}
|
|
|
a9f26f |
|
|
|
a9f26f |
@@ -353,8 +361,8 @@ test_setup() {
|
|
|
a9f26f |
|
|
|
a9f26f |
# Make client's dracut image
|
|
|
a9f26f |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a9f26f |
- -o "plymouth dash" \
|
|
|
a9f26f |
- -a "debug watchdog" \
|
|
|
a9f26f |
+ -o "plymouth dash ${OMIT_NETWORK}" \
|
|
|
a9f26f |
+ -a "debug watchdog ${USE_NETWORK}" \
|
|
|
a9f26f |
-d "af_packet piix ide-gd_mod ata_piix sd_mod e1000 nfs sunrpc i6300esb" \
|
|
|
a9f26f |
--no-hostonly-cmdline -N \
|
|
|
a9f26f |
-f $TESTDIR/initramfs.testing $KVERSION || return 1
|
|
|
a9f26f |
diff --git a/test/TEST-21-NFS-NM/Makefile b/test/TEST-21-NFS-NM/Makefile
|
|
|
a9f26f |
new file mode 100644
|
|
|
a9f26f |
index 00000000..b19122a1
|
|
|
a9f26f |
--- /dev/null
|
|
|
a9f26f |
+++ b/test/TEST-21-NFS-NM/Makefile
|
|
|
a9f26f |
@@ -0,0 +1,12 @@
|
|
|
a9f26f |
+.PHONY: all setup clean run
|
|
|
a9f26f |
+
|
|
|
a9f26f |
+BASETEST=../TEST-20-NFS
|
|
|
a9f26f |
+
|
|
|
a9f26f |
+all:
|
|
|
a9f26f |
+ @$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) all
|
|
|
a9f26f |
+setup:
|
|
|
a9f26f |
+ @$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) setup
|
|
|
a9f26f |
+clean:
|
|
|
a9f26f |
+ @$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) clean
|
|
|
a9f26f |
+run:
|
|
|
a9f26f |
+ @$(MAKE) NM=1 -s --no-print-directory -C $(BASETEST) run
|
|
|
a9f26f |
|