Skip to content

Commit

Permalink
ci: backport TEST-21-NFS-NM
Browse files Browse the repository at this point in the history
Loosely cherry-picked from a3f7329.

rhel-only
  • Loading branch information
mrc0mmand authored and lnykryn committed Nov 15, 2021
1 parent e2c7b61 commit 4361354
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ jobs:
"13",
"17",
"20",
#"21", needs backport (NFS + NM)
"21",
"40",
#"41", needws backport (NBD + NM)
"98",
]
fail-fast: false
Expand Down
14 changes: 11 additions & 3 deletions test/TEST-20-NFS/test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
#!/bin/bash
TEST_DESCRIPTION="root filesystem on NFS"
if [[ $NM ]]; then
USE_NETWORK="network-manager"
OMIT_NETWORK="network-legacy"
else
USE_NETWORK="network-legacy"
OMIT_NETWORK="network-manager"
fi

TEST_DESCRIPTION="root filesystem on NFS with $USE_NETWORK"

KVERSION=${KVERSION-$(uname -r)}

Expand Down Expand Up @@ -353,8 +361,8 @@ test_setup() {

# Make client's dracut image
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
-o "plymouth dash" \
-a "debug watchdog" \
-o "plymouth dash ${OMIT_NETWORK}" \
-a "debug watchdog ${USE_NETWORK}" \
-d "af_packet piix ide-gd_mod ata_piix sd_mod e1000 nfs sunrpc i6300esb" \
--no-hostonly-cmdline -N \
-f $TESTDIR/initramfs.testing $KVERSION || return 1
Expand Down
12 changes: 12 additions & 0 deletions test/TEST-21-NFS-NM/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.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

0 comments on commit 4361354

Please sign in to comment.