From 5bb613dc902f524325767db74c9506850e185f88 Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Fri, 11 Oct 2024 09:13:41 -0400 Subject: [PATCH] test: reorganize tests 10-19: core modules 20-29: multiple boot drives 30-39: live boot 40-49: systemd 60-69: basic networking (nfs) 70-79: advanced networking (iscsi, nbd) 80-89: dracut binaries old -> new ---------- 01 -> 10 02 -> 40 03 -> 11 04 -> 41 05 -> 42 10 -> 20 11 -> 21 12 -> 22 13 -> 25 14 -> 23 15 -> 24 16 -> 30 17 -> 25 18 -> 12 20 -> 60 30 -> 70 35 -> 71 40 -> 72 50 -> 61 60 -> 62 62 -> 81 63 -> 82 98 -> 80 --- .github/workflows/integration.yml | 40 +++++++++--------- .../{TEST-01-BASIC => TEST-10-BASIC}/Makefile | 0 .../create-root.sh | 0 test/{TEST-01-BASIC => TEST-10-BASIC}/test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../fstab | 0 .../test.sh | 0 .../Makefile | 0 test/{TEST-18-UEFI => TEST-12-UEFI}/test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../cryptroot-ask.sh | 0 test/{TEST-10-RAID => TEST-20-RAID}/test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 test/{TEST-11-LVM => TEST-21-LVM}/test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../cryptroot-ask.sh | 0 .../test.sh | 0 test/{TEST-11-LVM => TEST-23-IMSM}/Makefile | 0 .../create-root.sh | 0 .../cryptroot-ask.sh | 0 test/{TEST-14-IMSM => TEST-23-IMSM}/test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../cryptroot-ask.sh | 0 .../test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../test-init.sh | 0 .../test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../systemd-analyze.sh | 0 .../test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../test-init.sh | 0 .../test.sh | 0 .../Makefile | 0 .../create-root.sh | 0 .../test.sh | 0 test/{TEST-20-NFS => TEST-60-NFS}/Makefile | 0 .../client-init.sh | 0 test/{TEST-20-NFS => TEST-60-NFS}/client.link | 0 .../create-root.sh | 0 test/{TEST-20-NFS => TEST-60-NFS}/dhcpd.conf | 0 test/{TEST-20-NFS => TEST-60-NFS}/exports | 0 .../finished-false.sh | 0 test/{TEST-20-NFS => TEST-60-NFS}/hard-off.sh | 0 .../server-init.sh | 0 test/{TEST-20-NFS => TEST-60-NFS}/server.link | 0 test/{TEST-20-NFS => TEST-60-NFS}/test.sh | 0 .../wait-if-server.sh | 0 .../Makefile | 0 .../client-init.sh | 0 .../client.link | 0 .../create-root.sh | 0 .../dhcpd.conf | 0 .../exports | 0 .../finished-false.sh | 0 .../hard-off.sh | 0 .../server-init.sh | 0 .../server.link | 0 .../test.sh | 0 .../wait-if-server.sh | 0 .../Makefile | 0 .../client-init.sh | 0 .../client.link | 0 .../create-root.sh | 0 .../dhcpd.conf | 0 .../exports | 0 .../finished-false.sh | 0 .../hard-off.sh | 0 .../server-init.sh | 0 .../server.link | 0 .../test.sh | 0 .../wait-if-server.sh | 0 .../{TEST-30-ISCSI => TEST-70-ISCSI}/Makefile | 0 .../client-init.sh | 0 .../client.link | 0 .../create-client-root.sh | 0 .../create-server-root.sh | 0 .../dhcpd.conf | 0 test/{TEST-30-ISCSI => TEST-70-ISCSI}/ibft.pl | 0 .../ibft.table | Bin .../server-init.sh | 0 .../server.link | 0 test/{TEST-30-ISCSI => TEST-70-ISCSI}/test.sh | 0 .../wait-if-server.sh | 0 .../Makefile | 0 .../client-init.sh | 0 .../client.link | 0 .../create-client-root.sh | 0 .../create-server-root.sh | 0 .../dhcpd.conf | 0 .../server-init.sh | 0 .../server.link | 0 .../test.sh | 0 .../wait-if-server.sh | 0 .../Makefile | 0 .../client-init.sh | 0 .../client.link | 0 .../create-client-root.sh | 0 .../create-encrypted-root.sh | 0 .../create-server-root.sh | 0 .../cryptroot-ask.sh | 0 test/{TEST-40-NBD => TEST-72-NBD}/dhcpd.conf | 0 .../server-init.sh | 0 .../server.link | 0 test/{TEST-40-NBD => TEST-72-NBD}/test.sh | 0 .../wait-if-server.sh | 0 .../Makefile | 0 .../test.sh | 0 .../Makefile | 0 .../test.sh | 0 .../Makefile | 0 .../test.sh | 0 126 files changed, 20 insertions(+), 20 deletions(-) rename test/{TEST-01-BASIC => TEST-10-BASIC}/Makefile (100%) rename test/{TEST-01-BASIC => TEST-10-BASIC}/create-root.sh (100%) rename test/{TEST-01-BASIC => TEST-10-BASIC}/test.sh (100%) rename test/{TEST-02-SYSTEMD => TEST-11-USR-MOUNT}/Makefile (100%) rename test/{TEST-03-USR-MOUNT => TEST-11-USR-MOUNT}/create-root.sh (100%) rename test/{TEST-03-USR-MOUNT => TEST-11-USR-MOUNT}/fstab (100%) rename test/{TEST-03-USR-MOUNT => TEST-11-USR-MOUNT}/test.sh (100%) rename test/{TEST-03-USR-MOUNT => TEST-12-UEFI}/Makefile (100%) rename test/{TEST-18-UEFI => TEST-12-UEFI}/test.sh (100%) rename test/{TEST-04-FULL-SYSTEMD => TEST-20-RAID}/Makefile (100%) rename test/{TEST-10-RAID => TEST-20-RAID}/create-root.sh (100%) rename test/{TEST-10-RAID => TEST-20-RAID}/cryptroot-ask.sh (100%) rename test/{TEST-10-RAID => TEST-20-RAID}/test.sh (100%) rename test/{TEST-05-SYSTEMD-INITRD => TEST-21-LVM}/Makefile (100%) rename test/{TEST-11-LVM => TEST-21-LVM}/create-root.sh (100%) rename test/{TEST-11-LVM => TEST-21-LVM}/test.sh (100%) rename test/{TEST-10-RAID => TEST-22-RAID-DEG}/Makefile (100%) rename test/{TEST-12-RAID-DEG => TEST-22-RAID-DEG}/create-root.sh (100%) rename test/{TEST-12-RAID-DEG => TEST-22-RAID-DEG}/cryptroot-ask.sh (100%) rename test/{TEST-12-RAID-DEG => TEST-22-RAID-DEG}/test.sh (100%) rename test/{TEST-11-LVM => TEST-23-IMSM}/Makefile (100%) rename test/{TEST-14-IMSM => TEST-23-IMSM}/create-root.sh (100%) rename test/{TEST-13-ENC-RAID-LVM => TEST-23-IMSM}/cryptroot-ask.sh (100%) rename test/{TEST-14-IMSM => TEST-23-IMSM}/test.sh (100%) rename test/{TEST-12-RAID-DEG => TEST-24-BTRFSRAID}/Makefile (100%) rename test/{TEST-15-BTRFSRAID => TEST-24-BTRFSRAID}/create-root.sh (100%) rename test/{TEST-15-BTRFSRAID => TEST-24-BTRFSRAID}/test.sh (100%) rename test/{TEST-13-ENC-RAID-LVM => TEST-25-LVM-THIN}/Makefile (100%) rename test/{TEST-17-LVM-THIN => TEST-25-LVM-THIN}/create-root.sh (100%) rename test/{TEST-17-LVM-THIN => TEST-25-LVM-THIN}/test.sh (100%) rename test/{TEST-14-IMSM => TEST-26-ENC-RAID-LVM}/Makefile (100%) rename test/{TEST-13-ENC-RAID-LVM => TEST-26-ENC-RAID-LVM}/create-root.sh (100%) rename test/{TEST-14-IMSM => TEST-26-ENC-RAID-LVM}/cryptroot-ask.sh (100%) rename test/{TEST-13-ENC-RAID-LVM => TEST-26-ENC-RAID-LVM}/test.sh (100%) rename test/{TEST-15-BTRFSRAID => TEST-30-DMSQUASH}/Makefile (100%) rename test/{TEST-16-DMSQUASH => TEST-30-DMSQUASH}/create-root.sh (100%) rename test/{TEST-16-DMSQUASH => TEST-30-DMSQUASH}/test-init.sh (100%) rename test/{TEST-16-DMSQUASH => TEST-30-DMSQUASH}/test.sh (100%) rename test/{TEST-16-DMSQUASH => TEST-40-SYSTEMD}/Makefile (100%) rename test/{TEST-02-SYSTEMD => TEST-40-SYSTEMD}/create-root.sh (100%) rename test/{TEST-02-SYSTEMD => TEST-40-SYSTEMD}/systemd-analyze.sh (100%) rename test/{TEST-02-SYSTEMD => TEST-40-SYSTEMD}/test.sh (100%) rename test/{TEST-17-LVM-THIN => TEST-41-FULL-SYSTEMD}/Makefile (100%) rename test/{TEST-04-FULL-SYSTEMD => TEST-41-FULL-SYSTEMD}/create-root.sh (100%) rename test/{TEST-04-FULL-SYSTEMD => TEST-41-FULL-SYSTEMD}/test-init.sh (100%) rename test/{TEST-04-FULL-SYSTEMD => TEST-41-FULL-SYSTEMD}/test.sh (100%) rename test/{TEST-18-UEFI => TEST-42-SYSTEMD-INITRD}/Makefile (100%) rename test/{TEST-05-SYSTEMD-INITRD => TEST-42-SYSTEMD-INITRD}/create-root.sh (100%) rename test/{TEST-05-SYSTEMD-INITRD => TEST-42-SYSTEMD-INITRD}/test.sh (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/Makefile (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/client-init.sh (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/client.link (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/create-root.sh (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/dhcpd.conf (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/exports (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/finished-false.sh (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/hard-off.sh (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/server-init.sh (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/server.link (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/test.sh (100%) rename test/{TEST-20-NFS => TEST-60-NFS}/wait-if-server.sh (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-61-MULTINIC}/Makefile (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/client-init.sh (100%) rename test/{TEST-30-ISCSI => TEST-61-MULTINIC}/client.link (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/create-root.sh (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/dhcpd.conf (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/exports (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/finished-false.sh (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/hard-off.sh (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/server-init.sh (100%) rename test/{TEST-30-ISCSI => TEST-61-MULTINIC}/server.link (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/test.sh (100%) rename test/{TEST-50-MULTINIC => TEST-61-MULTINIC}/wait-if-server.sh (100%) rename test/{TEST-40-NBD => TEST-62-BONDBRIDGEVLAN}/Makefile (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/client-init.sh (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-62-BONDBRIDGEVLAN}/client.link (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/create-root.sh (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/dhcpd.conf (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/exports (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/finished-false.sh (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/hard-off.sh (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/server-init.sh (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-62-BONDBRIDGEVLAN}/server.link (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/test.sh (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-62-BONDBRIDGEVLAN}/wait-if-server.sh (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/Makefile (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/client-init.sh (100%) rename test/{TEST-40-NBD => TEST-70-ISCSI}/client.link (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/create-client-root.sh (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/create-server-root.sh (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/dhcpd.conf (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/ibft.pl (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/ibft.table (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/server-init.sh (100%) rename test/{TEST-40-NBD => TEST-70-ISCSI}/server.link (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/test.sh (100%) rename test/{TEST-30-ISCSI => TEST-70-ISCSI}/wait-if-server.sh (100%) rename test/{TEST-50-MULTINIC => TEST-71-ISCSI-MULTI}/Makefile (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-71-ISCSI-MULTI}/client-init.sh (100%) rename test/{TEST-50-MULTINIC => TEST-71-ISCSI-MULTI}/client.link (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-71-ISCSI-MULTI}/create-client-root.sh (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-71-ISCSI-MULTI}/create-server-root.sh (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-71-ISCSI-MULTI}/dhcpd.conf (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-71-ISCSI-MULTI}/server-init.sh (100%) rename test/{TEST-50-MULTINIC => TEST-71-ISCSI-MULTI}/server.link (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-71-ISCSI-MULTI}/test.sh (100%) rename test/{TEST-35-ISCSI-MULTI => TEST-71-ISCSI-MULTI}/wait-if-server.sh (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-72-NBD}/Makefile (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/client-init.sh (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-72-NBD}/client.link (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/create-client-root.sh (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/create-encrypted-root.sh (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/create-server-root.sh (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/cryptroot-ask.sh (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/dhcpd.conf (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/server-init.sh (100%) rename test/{TEST-60-BONDBRIDGEVLAN => TEST-72-NBD}/server.link (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/test.sh (100%) rename test/{TEST-40-NBD => TEST-72-NBD}/wait-if-server.sh (100%) rename test/{TEST-62-SKIPCPIO => TEST-80-GETARG}/Makefile (100%) rename test/{TEST-98-GETARG => TEST-80-GETARG}/test.sh (100%) rename test/{TEST-63-DRACUT-CPIO => TEST-81-SKIPCPIO}/Makefile (100%) rename test/{TEST-62-SKIPCPIO => TEST-81-SKIPCPIO}/test.sh (100%) rename test/{TEST-98-GETARG => TEST-82-DRACUT-CPIO}/Makefile (100%) rename test/{TEST-63-DRACUT-CPIO => TEST-82-DRACUT-CPIO}/test.sh (100%) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 95366b01f..013deb612 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -32,7 +32,7 @@ jobs: "void", ] test: [ - "01", + "10", ] container: image: ghcr.io/dracut-ng/${{ matrix.container }} @@ -63,21 +63,21 @@ jobs: "void", ] test: [ - "02", - "03", - "04", - "05", - "10", "11", "12", - "13", - "14", - "15", - "16", - "17", - "18", - "62", - "98", + "20", + "21", + "22", + "23", + "24", + "25", + "26", + "30", + "40", + "41", + "42", + "80", + "81", ] container: image: ghcr.io/dracut-ng/${{ matrix.container }} @@ -101,7 +101,7 @@ jobs: "opensuse", ] test: [ - "63", + "82", ] container: image: ghcr.io/dracut-ng/${{ matrix.container }} @@ -126,7 +126,7 @@ jobs: "fedora", ] test: [ - "98", + "80", ] steps: - name: Set up QEMU @@ -157,9 +157,9 @@ jobs: "ubuntu", ] test: [ - "20", - "50", "60", + "61", + "62", ] include: - network: "" @@ -197,7 +197,7 @@ jobs: "opensuse", "ubuntu", ] - test: [ "30","35" ] + test: [ "70","71" ] include: - network: "" - # on debian run tests with systemd-networkd @@ -232,7 +232,7 @@ jobs: "fedora", "opensuse", ] - test: [ "40" ] + test: [ "72" ] include: - network: "" - # on openSUSE run tests with network-legacy diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-10-BASIC/Makefile similarity index 100% rename from test/TEST-01-BASIC/Makefile rename to test/TEST-10-BASIC/Makefile diff --git a/test/TEST-01-BASIC/create-root.sh b/test/TEST-10-BASIC/create-root.sh similarity index 100% rename from test/TEST-01-BASIC/create-root.sh rename to test/TEST-10-BASIC/create-root.sh diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-10-BASIC/test.sh similarity index 100% rename from test/TEST-01-BASIC/test.sh rename to test/TEST-10-BASIC/test.sh diff --git a/test/TEST-02-SYSTEMD/Makefile b/test/TEST-11-USR-MOUNT/Makefile similarity index 100% rename from test/TEST-02-SYSTEMD/Makefile rename to test/TEST-11-USR-MOUNT/Makefile diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-11-USR-MOUNT/create-root.sh similarity index 100% rename from test/TEST-03-USR-MOUNT/create-root.sh rename to test/TEST-11-USR-MOUNT/create-root.sh diff --git a/test/TEST-03-USR-MOUNT/fstab b/test/TEST-11-USR-MOUNT/fstab similarity index 100% rename from test/TEST-03-USR-MOUNT/fstab rename to test/TEST-11-USR-MOUNT/fstab diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-11-USR-MOUNT/test.sh similarity index 100% rename from test/TEST-03-USR-MOUNT/test.sh rename to test/TEST-11-USR-MOUNT/test.sh diff --git a/test/TEST-03-USR-MOUNT/Makefile b/test/TEST-12-UEFI/Makefile similarity index 100% rename from test/TEST-03-USR-MOUNT/Makefile rename to test/TEST-12-UEFI/Makefile diff --git a/test/TEST-18-UEFI/test.sh b/test/TEST-12-UEFI/test.sh similarity index 100% rename from test/TEST-18-UEFI/test.sh rename to test/TEST-12-UEFI/test.sh diff --git a/test/TEST-04-FULL-SYSTEMD/Makefile b/test/TEST-20-RAID/Makefile similarity index 100% rename from test/TEST-04-FULL-SYSTEMD/Makefile rename to test/TEST-20-RAID/Makefile diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-20-RAID/create-root.sh similarity index 100% rename from test/TEST-10-RAID/create-root.sh rename to test/TEST-20-RAID/create-root.sh diff --git a/test/TEST-10-RAID/cryptroot-ask.sh b/test/TEST-20-RAID/cryptroot-ask.sh similarity index 100% rename from test/TEST-10-RAID/cryptroot-ask.sh rename to test/TEST-20-RAID/cryptroot-ask.sh diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-20-RAID/test.sh similarity index 100% rename from test/TEST-10-RAID/test.sh rename to test/TEST-20-RAID/test.sh diff --git a/test/TEST-05-SYSTEMD-INITRD/Makefile b/test/TEST-21-LVM/Makefile similarity index 100% rename from test/TEST-05-SYSTEMD-INITRD/Makefile rename to test/TEST-21-LVM/Makefile diff --git a/test/TEST-11-LVM/create-root.sh b/test/TEST-21-LVM/create-root.sh similarity index 100% rename from test/TEST-11-LVM/create-root.sh rename to test/TEST-21-LVM/create-root.sh diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-21-LVM/test.sh similarity index 100% rename from test/TEST-11-LVM/test.sh rename to test/TEST-21-LVM/test.sh diff --git a/test/TEST-10-RAID/Makefile b/test/TEST-22-RAID-DEG/Makefile similarity index 100% rename from test/TEST-10-RAID/Makefile rename to test/TEST-22-RAID-DEG/Makefile diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-22-RAID-DEG/create-root.sh similarity index 100% rename from test/TEST-12-RAID-DEG/create-root.sh rename to test/TEST-22-RAID-DEG/create-root.sh diff --git a/test/TEST-12-RAID-DEG/cryptroot-ask.sh b/test/TEST-22-RAID-DEG/cryptroot-ask.sh similarity index 100% rename from test/TEST-12-RAID-DEG/cryptroot-ask.sh rename to test/TEST-22-RAID-DEG/cryptroot-ask.sh diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-22-RAID-DEG/test.sh similarity index 100% rename from test/TEST-12-RAID-DEG/test.sh rename to test/TEST-22-RAID-DEG/test.sh diff --git a/test/TEST-11-LVM/Makefile b/test/TEST-23-IMSM/Makefile similarity index 100% rename from test/TEST-11-LVM/Makefile rename to test/TEST-23-IMSM/Makefile diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-23-IMSM/create-root.sh similarity index 100% rename from test/TEST-14-IMSM/create-root.sh rename to test/TEST-23-IMSM/create-root.sh diff --git a/test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh b/test/TEST-23-IMSM/cryptroot-ask.sh similarity index 100% rename from test/TEST-13-ENC-RAID-LVM/cryptroot-ask.sh rename to test/TEST-23-IMSM/cryptroot-ask.sh diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-23-IMSM/test.sh similarity index 100% rename from test/TEST-14-IMSM/test.sh rename to test/TEST-23-IMSM/test.sh diff --git a/test/TEST-12-RAID-DEG/Makefile b/test/TEST-24-BTRFSRAID/Makefile similarity index 100% rename from test/TEST-12-RAID-DEG/Makefile rename to test/TEST-24-BTRFSRAID/Makefile diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-24-BTRFSRAID/create-root.sh similarity index 100% rename from test/TEST-15-BTRFSRAID/create-root.sh rename to test/TEST-24-BTRFSRAID/create-root.sh diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-24-BTRFSRAID/test.sh similarity index 100% rename from test/TEST-15-BTRFSRAID/test.sh rename to test/TEST-24-BTRFSRAID/test.sh diff --git a/test/TEST-13-ENC-RAID-LVM/Makefile b/test/TEST-25-LVM-THIN/Makefile similarity index 100% rename from test/TEST-13-ENC-RAID-LVM/Makefile rename to test/TEST-25-LVM-THIN/Makefile diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-25-LVM-THIN/create-root.sh similarity index 100% rename from test/TEST-17-LVM-THIN/create-root.sh rename to test/TEST-25-LVM-THIN/create-root.sh diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-25-LVM-THIN/test.sh similarity index 100% rename from test/TEST-17-LVM-THIN/test.sh rename to test/TEST-25-LVM-THIN/test.sh diff --git a/test/TEST-14-IMSM/Makefile b/test/TEST-26-ENC-RAID-LVM/Makefile similarity index 100% rename from test/TEST-14-IMSM/Makefile rename to test/TEST-26-ENC-RAID-LVM/Makefile diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-26-ENC-RAID-LVM/create-root.sh similarity index 100% rename from test/TEST-13-ENC-RAID-LVM/create-root.sh rename to test/TEST-26-ENC-RAID-LVM/create-root.sh diff --git a/test/TEST-14-IMSM/cryptroot-ask.sh b/test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh similarity index 100% rename from test/TEST-14-IMSM/cryptroot-ask.sh rename to test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh similarity index 100% rename from test/TEST-13-ENC-RAID-LVM/test.sh rename to test/TEST-26-ENC-RAID-LVM/test.sh diff --git a/test/TEST-15-BTRFSRAID/Makefile b/test/TEST-30-DMSQUASH/Makefile similarity index 100% rename from test/TEST-15-BTRFSRAID/Makefile rename to test/TEST-30-DMSQUASH/Makefile diff --git a/test/TEST-16-DMSQUASH/create-root.sh b/test/TEST-30-DMSQUASH/create-root.sh similarity index 100% rename from test/TEST-16-DMSQUASH/create-root.sh rename to test/TEST-30-DMSQUASH/create-root.sh diff --git a/test/TEST-16-DMSQUASH/test-init.sh b/test/TEST-30-DMSQUASH/test-init.sh similarity index 100% rename from test/TEST-16-DMSQUASH/test-init.sh rename to test/TEST-30-DMSQUASH/test-init.sh diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-30-DMSQUASH/test.sh similarity index 100% rename from test/TEST-16-DMSQUASH/test.sh rename to test/TEST-30-DMSQUASH/test.sh diff --git a/test/TEST-16-DMSQUASH/Makefile b/test/TEST-40-SYSTEMD/Makefile similarity index 100% rename from test/TEST-16-DMSQUASH/Makefile rename to test/TEST-40-SYSTEMD/Makefile diff --git a/test/TEST-02-SYSTEMD/create-root.sh b/test/TEST-40-SYSTEMD/create-root.sh similarity index 100% rename from test/TEST-02-SYSTEMD/create-root.sh rename to test/TEST-40-SYSTEMD/create-root.sh diff --git a/test/TEST-02-SYSTEMD/systemd-analyze.sh b/test/TEST-40-SYSTEMD/systemd-analyze.sh similarity index 100% rename from test/TEST-02-SYSTEMD/systemd-analyze.sh rename to test/TEST-40-SYSTEMD/systemd-analyze.sh diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-40-SYSTEMD/test.sh similarity index 100% rename from test/TEST-02-SYSTEMD/test.sh rename to test/TEST-40-SYSTEMD/test.sh diff --git a/test/TEST-17-LVM-THIN/Makefile b/test/TEST-41-FULL-SYSTEMD/Makefile similarity index 100% rename from test/TEST-17-LVM-THIN/Makefile rename to test/TEST-41-FULL-SYSTEMD/Makefile diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-41-FULL-SYSTEMD/create-root.sh similarity index 100% rename from test/TEST-04-FULL-SYSTEMD/create-root.sh rename to test/TEST-41-FULL-SYSTEMD/create-root.sh diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-41-FULL-SYSTEMD/test-init.sh similarity index 100% rename from test/TEST-04-FULL-SYSTEMD/test-init.sh rename to test/TEST-41-FULL-SYSTEMD/test-init.sh diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-41-FULL-SYSTEMD/test.sh similarity index 100% rename from test/TEST-04-FULL-SYSTEMD/test.sh rename to test/TEST-41-FULL-SYSTEMD/test.sh diff --git a/test/TEST-18-UEFI/Makefile b/test/TEST-42-SYSTEMD-INITRD/Makefile similarity index 100% rename from test/TEST-18-UEFI/Makefile rename to test/TEST-42-SYSTEMD-INITRD/Makefile diff --git a/test/TEST-05-SYSTEMD-INITRD/create-root.sh b/test/TEST-42-SYSTEMD-INITRD/create-root.sh similarity index 100% rename from test/TEST-05-SYSTEMD-INITRD/create-root.sh rename to test/TEST-42-SYSTEMD-INITRD/create-root.sh diff --git a/test/TEST-05-SYSTEMD-INITRD/test.sh b/test/TEST-42-SYSTEMD-INITRD/test.sh similarity index 100% rename from test/TEST-05-SYSTEMD-INITRD/test.sh rename to test/TEST-42-SYSTEMD-INITRD/test.sh diff --git a/test/TEST-20-NFS/Makefile b/test/TEST-60-NFS/Makefile similarity index 100% rename from test/TEST-20-NFS/Makefile rename to test/TEST-60-NFS/Makefile diff --git a/test/TEST-20-NFS/client-init.sh b/test/TEST-60-NFS/client-init.sh similarity index 100% rename from test/TEST-20-NFS/client-init.sh rename to test/TEST-60-NFS/client-init.sh diff --git a/test/TEST-20-NFS/client.link b/test/TEST-60-NFS/client.link similarity index 100% rename from test/TEST-20-NFS/client.link rename to test/TEST-60-NFS/client.link diff --git a/test/TEST-20-NFS/create-root.sh b/test/TEST-60-NFS/create-root.sh similarity index 100% rename from test/TEST-20-NFS/create-root.sh rename to test/TEST-60-NFS/create-root.sh diff --git a/test/TEST-20-NFS/dhcpd.conf b/test/TEST-60-NFS/dhcpd.conf similarity index 100% rename from test/TEST-20-NFS/dhcpd.conf rename to test/TEST-60-NFS/dhcpd.conf diff --git a/test/TEST-20-NFS/exports b/test/TEST-60-NFS/exports similarity index 100% rename from test/TEST-20-NFS/exports rename to test/TEST-60-NFS/exports diff --git a/test/TEST-20-NFS/finished-false.sh b/test/TEST-60-NFS/finished-false.sh similarity index 100% rename from test/TEST-20-NFS/finished-false.sh rename to test/TEST-60-NFS/finished-false.sh diff --git a/test/TEST-20-NFS/hard-off.sh b/test/TEST-60-NFS/hard-off.sh similarity index 100% rename from test/TEST-20-NFS/hard-off.sh rename to test/TEST-60-NFS/hard-off.sh diff --git a/test/TEST-20-NFS/server-init.sh b/test/TEST-60-NFS/server-init.sh similarity index 100% rename from test/TEST-20-NFS/server-init.sh rename to test/TEST-60-NFS/server-init.sh diff --git a/test/TEST-20-NFS/server.link b/test/TEST-60-NFS/server.link similarity index 100% rename from test/TEST-20-NFS/server.link rename to test/TEST-60-NFS/server.link diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-60-NFS/test.sh similarity index 100% rename from test/TEST-20-NFS/test.sh rename to test/TEST-60-NFS/test.sh diff --git a/test/TEST-20-NFS/wait-if-server.sh b/test/TEST-60-NFS/wait-if-server.sh similarity index 100% rename from test/TEST-20-NFS/wait-if-server.sh rename to test/TEST-60-NFS/wait-if-server.sh diff --git a/test/TEST-35-ISCSI-MULTI/Makefile b/test/TEST-61-MULTINIC/Makefile similarity index 100% rename from test/TEST-35-ISCSI-MULTI/Makefile rename to test/TEST-61-MULTINIC/Makefile diff --git a/test/TEST-50-MULTINIC/client-init.sh b/test/TEST-61-MULTINIC/client-init.sh similarity index 100% rename from test/TEST-50-MULTINIC/client-init.sh rename to test/TEST-61-MULTINIC/client-init.sh diff --git a/test/TEST-30-ISCSI/client.link b/test/TEST-61-MULTINIC/client.link similarity index 100% rename from test/TEST-30-ISCSI/client.link rename to test/TEST-61-MULTINIC/client.link diff --git a/test/TEST-50-MULTINIC/create-root.sh b/test/TEST-61-MULTINIC/create-root.sh similarity index 100% rename from test/TEST-50-MULTINIC/create-root.sh rename to test/TEST-61-MULTINIC/create-root.sh diff --git a/test/TEST-50-MULTINIC/dhcpd.conf b/test/TEST-61-MULTINIC/dhcpd.conf similarity index 100% rename from test/TEST-50-MULTINIC/dhcpd.conf rename to test/TEST-61-MULTINIC/dhcpd.conf diff --git a/test/TEST-50-MULTINIC/exports b/test/TEST-61-MULTINIC/exports similarity index 100% rename from test/TEST-50-MULTINIC/exports rename to test/TEST-61-MULTINIC/exports diff --git a/test/TEST-50-MULTINIC/finished-false.sh b/test/TEST-61-MULTINIC/finished-false.sh similarity index 100% rename from test/TEST-50-MULTINIC/finished-false.sh rename to test/TEST-61-MULTINIC/finished-false.sh diff --git a/test/TEST-50-MULTINIC/hard-off.sh b/test/TEST-61-MULTINIC/hard-off.sh similarity index 100% rename from test/TEST-50-MULTINIC/hard-off.sh rename to test/TEST-61-MULTINIC/hard-off.sh diff --git a/test/TEST-50-MULTINIC/server-init.sh b/test/TEST-61-MULTINIC/server-init.sh similarity index 100% rename from test/TEST-50-MULTINIC/server-init.sh rename to test/TEST-61-MULTINIC/server-init.sh diff --git a/test/TEST-30-ISCSI/server.link b/test/TEST-61-MULTINIC/server.link similarity index 100% rename from test/TEST-30-ISCSI/server.link rename to test/TEST-61-MULTINIC/server.link diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-61-MULTINIC/test.sh similarity index 100% rename from test/TEST-50-MULTINIC/test.sh rename to test/TEST-61-MULTINIC/test.sh diff --git a/test/TEST-50-MULTINIC/wait-if-server.sh b/test/TEST-61-MULTINIC/wait-if-server.sh similarity index 100% rename from test/TEST-50-MULTINIC/wait-if-server.sh rename to test/TEST-61-MULTINIC/wait-if-server.sh diff --git a/test/TEST-40-NBD/Makefile b/test/TEST-62-BONDBRIDGEVLAN/Makefile similarity index 100% rename from test/TEST-40-NBD/Makefile rename to test/TEST-62-BONDBRIDGEVLAN/Makefile diff --git a/test/TEST-60-BONDBRIDGEVLAN/client-init.sh b/test/TEST-62-BONDBRIDGEVLAN/client-init.sh similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/client-init.sh rename to test/TEST-62-BONDBRIDGEVLAN/client-init.sh diff --git a/test/TEST-35-ISCSI-MULTI/client.link b/test/TEST-62-BONDBRIDGEVLAN/client.link similarity index 100% rename from test/TEST-35-ISCSI-MULTI/client.link rename to test/TEST-62-BONDBRIDGEVLAN/client.link diff --git a/test/TEST-60-BONDBRIDGEVLAN/create-root.sh b/test/TEST-62-BONDBRIDGEVLAN/create-root.sh similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/create-root.sh rename to test/TEST-62-BONDBRIDGEVLAN/create-root.sh diff --git a/test/TEST-60-BONDBRIDGEVLAN/dhcpd.conf b/test/TEST-62-BONDBRIDGEVLAN/dhcpd.conf similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/dhcpd.conf rename to test/TEST-62-BONDBRIDGEVLAN/dhcpd.conf diff --git a/test/TEST-60-BONDBRIDGEVLAN/exports b/test/TEST-62-BONDBRIDGEVLAN/exports similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/exports rename to test/TEST-62-BONDBRIDGEVLAN/exports diff --git a/test/TEST-60-BONDBRIDGEVLAN/finished-false.sh b/test/TEST-62-BONDBRIDGEVLAN/finished-false.sh similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/finished-false.sh rename to test/TEST-62-BONDBRIDGEVLAN/finished-false.sh diff --git a/test/TEST-60-BONDBRIDGEVLAN/hard-off.sh b/test/TEST-62-BONDBRIDGEVLAN/hard-off.sh similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/hard-off.sh rename to test/TEST-62-BONDBRIDGEVLAN/hard-off.sh diff --git a/test/TEST-60-BONDBRIDGEVLAN/server-init.sh b/test/TEST-62-BONDBRIDGEVLAN/server-init.sh similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/server-init.sh rename to test/TEST-62-BONDBRIDGEVLAN/server-init.sh diff --git a/test/TEST-35-ISCSI-MULTI/server.link b/test/TEST-62-BONDBRIDGEVLAN/server.link similarity index 100% rename from test/TEST-35-ISCSI-MULTI/server.link rename to test/TEST-62-BONDBRIDGEVLAN/server.link diff --git a/test/TEST-60-BONDBRIDGEVLAN/test.sh b/test/TEST-62-BONDBRIDGEVLAN/test.sh similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/test.sh rename to test/TEST-62-BONDBRIDGEVLAN/test.sh diff --git a/test/TEST-60-BONDBRIDGEVLAN/wait-if-server.sh b/test/TEST-62-BONDBRIDGEVLAN/wait-if-server.sh similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/wait-if-server.sh rename to test/TEST-62-BONDBRIDGEVLAN/wait-if-server.sh diff --git a/test/TEST-30-ISCSI/Makefile b/test/TEST-70-ISCSI/Makefile similarity index 100% rename from test/TEST-30-ISCSI/Makefile rename to test/TEST-70-ISCSI/Makefile diff --git a/test/TEST-30-ISCSI/client-init.sh b/test/TEST-70-ISCSI/client-init.sh similarity index 100% rename from test/TEST-30-ISCSI/client-init.sh rename to test/TEST-70-ISCSI/client-init.sh diff --git a/test/TEST-40-NBD/client.link b/test/TEST-70-ISCSI/client.link similarity index 100% rename from test/TEST-40-NBD/client.link rename to test/TEST-70-ISCSI/client.link diff --git a/test/TEST-30-ISCSI/create-client-root.sh b/test/TEST-70-ISCSI/create-client-root.sh similarity index 100% rename from test/TEST-30-ISCSI/create-client-root.sh rename to test/TEST-70-ISCSI/create-client-root.sh diff --git a/test/TEST-30-ISCSI/create-server-root.sh b/test/TEST-70-ISCSI/create-server-root.sh similarity index 100% rename from test/TEST-30-ISCSI/create-server-root.sh rename to test/TEST-70-ISCSI/create-server-root.sh diff --git a/test/TEST-30-ISCSI/dhcpd.conf b/test/TEST-70-ISCSI/dhcpd.conf similarity index 100% rename from test/TEST-30-ISCSI/dhcpd.conf rename to test/TEST-70-ISCSI/dhcpd.conf diff --git a/test/TEST-30-ISCSI/ibft.pl b/test/TEST-70-ISCSI/ibft.pl similarity index 100% rename from test/TEST-30-ISCSI/ibft.pl rename to test/TEST-70-ISCSI/ibft.pl diff --git a/test/TEST-30-ISCSI/ibft.table b/test/TEST-70-ISCSI/ibft.table similarity index 100% rename from test/TEST-30-ISCSI/ibft.table rename to test/TEST-70-ISCSI/ibft.table diff --git a/test/TEST-30-ISCSI/server-init.sh b/test/TEST-70-ISCSI/server-init.sh similarity index 100% rename from test/TEST-30-ISCSI/server-init.sh rename to test/TEST-70-ISCSI/server-init.sh diff --git a/test/TEST-40-NBD/server.link b/test/TEST-70-ISCSI/server.link similarity index 100% rename from test/TEST-40-NBD/server.link rename to test/TEST-70-ISCSI/server.link diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh similarity index 100% rename from test/TEST-30-ISCSI/test.sh rename to test/TEST-70-ISCSI/test.sh diff --git a/test/TEST-30-ISCSI/wait-if-server.sh b/test/TEST-70-ISCSI/wait-if-server.sh similarity index 100% rename from test/TEST-30-ISCSI/wait-if-server.sh rename to test/TEST-70-ISCSI/wait-if-server.sh diff --git a/test/TEST-50-MULTINIC/Makefile b/test/TEST-71-ISCSI-MULTI/Makefile similarity index 100% rename from test/TEST-50-MULTINIC/Makefile rename to test/TEST-71-ISCSI-MULTI/Makefile diff --git a/test/TEST-35-ISCSI-MULTI/client-init.sh b/test/TEST-71-ISCSI-MULTI/client-init.sh similarity index 100% rename from test/TEST-35-ISCSI-MULTI/client-init.sh rename to test/TEST-71-ISCSI-MULTI/client-init.sh diff --git a/test/TEST-50-MULTINIC/client.link b/test/TEST-71-ISCSI-MULTI/client.link similarity index 100% rename from test/TEST-50-MULTINIC/client.link rename to test/TEST-71-ISCSI-MULTI/client.link diff --git a/test/TEST-35-ISCSI-MULTI/create-client-root.sh b/test/TEST-71-ISCSI-MULTI/create-client-root.sh similarity index 100% rename from test/TEST-35-ISCSI-MULTI/create-client-root.sh rename to test/TEST-71-ISCSI-MULTI/create-client-root.sh diff --git a/test/TEST-35-ISCSI-MULTI/create-server-root.sh b/test/TEST-71-ISCSI-MULTI/create-server-root.sh similarity index 100% rename from test/TEST-35-ISCSI-MULTI/create-server-root.sh rename to test/TEST-71-ISCSI-MULTI/create-server-root.sh diff --git a/test/TEST-35-ISCSI-MULTI/dhcpd.conf b/test/TEST-71-ISCSI-MULTI/dhcpd.conf similarity index 100% rename from test/TEST-35-ISCSI-MULTI/dhcpd.conf rename to test/TEST-71-ISCSI-MULTI/dhcpd.conf diff --git a/test/TEST-35-ISCSI-MULTI/server-init.sh b/test/TEST-71-ISCSI-MULTI/server-init.sh similarity index 100% rename from test/TEST-35-ISCSI-MULTI/server-init.sh rename to test/TEST-71-ISCSI-MULTI/server-init.sh diff --git a/test/TEST-50-MULTINIC/server.link b/test/TEST-71-ISCSI-MULTI/server.link similarity index 100% rename from test/TEST-50-MULTINIC/server.link rename to test/TEST-71-ISCSI-MULTI/server.link diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh similarity index 100% rename from test/TEST-35-ISCSI-MULTI/test.sh rename to test/TEST-71-ISCSI-MULTI/test.sh diff --git a/test/TEST-35-ISCSI-MULTI/wait-if-server.sh b/test/TEST-71-ISCSI-MULTI/wait-if-server.sh similarity index 100% rename from test/TEST-35-ISCSI-MULTI/wait-if-server.sh rename to test/TEST-71-ISCSI-MULTI/wait-if-server.sh diff --git a/test/TEST-60-BONDBRIDGEVLAN/Makefile b/test/TEST-72-NBD/Makefile similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/Makefile rename to test/TEST-72-NBD/Makefile diff --git a/test/TEST-40-NBD/client-init.sh b/test/TEST-72-NBD/client-init.sh similarity index 100% rename from test/TEST-40-NBD/client-init.sh rename to test/TEST-72-NBD/client-init.sh diff --git a/test/TEST-60-BONDBRIDGEVLAN/client.link b/test/TEST-72-NBD/client.link similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/client.link rename to test/TEST-72-NBD/client.link diff --git a/test/TEST-40-NBD/create-client-root.sh b/test/TEST-72-NBD/create-client-root.sh similarity index 100% rename from test/TEST-40-NBD/create-client-root.sh rename to test/TEST-72-NBD/create-client-root.sh diff --git a/test/TEST-40-NBD/create-encrypted-root.sh b/test/TEST-72-NBD/create-encrypted-root.sh similarity index 100% rename from test/TEST-40-NBD/create-encrypted-root.sh rename to test/TEST-72-NBD/create-encrypted-root.sh diff --git a/test/TEST-40-NBD/create-server-root.sh b/test/TEST-72-NBD/create-server-root.sh similarity index 100% rename from test/TEST-40-NBD/create-server-root.sh rename to test/TEST-72-NBD/create-server-root.sh diff --git a/test/TEST-40-NBD/cryptroot-ask.sh b/test/TEST-72-NBD/cryptroot-ask.sh similarity index 100% rename from test/TEST-40-NBD/cryptroot-ask.sh rename to test/TEST-72-NBD/cryptroot-ask.sh diff --git a/test/TEST-40-NBD/dhcpd.conf b/test/TEST-72-NBD/dhcpd.conf similarity index 100% rename from test/TEST-40-NBD/dhcpd.conf rename to test/TEST-72-NBD/dhcpd.conf diff --git a/test/TEST-40-NBD/server-init.sh b/test/TEST-72-NBD/server-init.sh similarity index 100% rename from test/TEST-40-NBD/server-init.sh rename to test/TEST-72-NBD/server-init.sh diff --git a/test/TEST-60-BONDBRIDGEVLAN/server.link b/test/TEST-72-NBD/server.link similarity index 100% rename from test/TEST-60-BONDBRIDGEVLAN/server.link rename to test/TEST-72-NBD/server.link diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-72-NBD/test.sh similarity index 100% rename from test/TEST-40-NBD/test.sh rename to test/TEST-72-NBD/test.sh diff --git a/test/TEST-40-NBD/wait-if-server.sh b/test/TEST-72-NBD/wait-if-server.sh similarity index 100% rename from test/TEST-40-NBD/wait-if-server.sh rename to test/TEST-72-NBD/wait-if-server.sh diff --git a/test/TEST-62-SKIPCPIO/Makefile b/test/TEST-80-GETARG/Makefile similarity index 100% rename from test/TEST-62-SKIPCPIO/Makefile rename to test/TEST-80-GETARG/Makefile diff --git a/test/TEST-98-GETARG/test.sh b/test/TEST-80-GETARG/test.sh similarity index 100% rename from test/TEST-98-GETARG/test.sh rename to test/TEST-80-GETARG/test.sh diff --git a/test/TEST-63-DRACUT-CPIO/Makefile b/test/TEST-81-SKIPCPIO/Makefile similarity index 100% rename from test/TEST-63-DRACUT-CPIO/Makefile rename to test/TEST-81-SKIPCPIO/Makefile diff --git a/test/TEST-62-SKIPCPIO/test.sh b/test/TEST-81-SKIPCPIO/test.sh similarity index 100% rename from test/TEST-62-SKIPCPIO/test.sh rename to test/TEST-81-SKIPCPIO/test.sh diff --git a/test/TEST-98-GETARG/Makefile b/test/TEST-82-DRACUT-CPIO/Makefile similarity index 100% rename from test/TEST-98-GETARG/Makefile rename to test/TEST-82-DRACUT-CPIO/Makefile diff --git a/test/TEST-63-DRACUT-CPIO/test.sh b/test/TEST-82-DRACUT-CPIO/test.sh similarity index 100% rename from test/TEST-63-DRACUT-CPIO/test.sh rename to test/TEST-82-DRACUT-CPIO/test.sh -- 2.47.3