From 3b89c398895abe5fc62e3c9240718310222925ef Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 10 Jun 2019 16:04:33 +0200 Subject: [PATCH] test/IFCFG: make sure the network-legacy plugin is being used If the network-manager plugin is used instead, it wouldn't write out ifcfg files and we wouldn't have anything to check. While at that, also enable the test. (cherry picked from commit 2b1b3bcdcb0ddaa18337f18da515adb6284df0ab) --- .travis.yml | 1 + README.md | 1 + test/TEST-60-IFCFG/test.sh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 364078cf..37002e9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ env: - IMAGE=latest TESTS=50 - IMAGE=latest TESTS=30 - IMAGE=latest TESTS=31 + - IMAGE=latest TESTS=60 - IMAGE=latest TESTS=70 - IMAGE=latest TESTS=99 - IMAGE=latest TESTS=02 diff --git a/README.md b/README.md index 36ae7e1b..530f1c1b 100644 --- a/README.md +++ b/README.md @@ -27,4 +27,5 @@ dracut is an initramfs infrastructure. - Test 31: [![Test 31](https://ci.centos.org/job/dracut-matrix-master/TESTS=31,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=31,label=dracut-ci-slave01/) - Test 40: [![Test 40](https://ci.centos.org/job/dracut-matrix-master/TESTS=40,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=40,label=dracut-ci-slave01/) - Test 50: [![Test 50](https://ci.centos.org/job/dracut-matrix-master/TESTS=50,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=50,label=dracut-ci-slave01/) +- Test 60: [![Test 60](https://ci.centos.org/job/dracut-matrix-master/TESTS=60,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=60,label=dracut-ci-slave01/) - Test 70: [![Test 70](https://ci.centos.org/job/dracut-matrix-master/TESTS=70,label=dracut-ci-slave01/badge/icon)](https://ci.centos.org/job/dracut-matrix-master/TESTS=70,label=dracut-ci-slave01/) diff --git a/test/TEST-60-IFCFG/test.sh b/test/TEST-60-IFCFG/test.sh index 8c11a7d3..8e8bd982 100755 --- a/test/TEST-60-IFCFG/test.sh +++ b/test/TEST-60-IFCFG/test.sh @@ -316,7 +316,7 @@ test_setup() { $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \ --no-early-microcode \ -o "plymouth" \ - -a "debug" \ + -a "debug network-legacy" \ -d "ipvlan macvlan af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esb ib700wdt" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1