[PATCH 1/3] tests: generate correct RPM name

[Coiby Xu]

Tests failed to run against Fedora 37 or newer cloud images because of
the following error,
    It's a image with multiple partitions, using last partition as main partition
    'xxx/tests/build/x86_64/kexec-tools-2.0.26-5.fc37.src.rpm' not found
    /dev/nbd0 disconnected
    make: *** [Makefile:73: xxx/tests/output/test-base-image] Error 1

This is because starting with Fedora 37, rpm changes its API,
    # Fedora >= 37
    $ rpm -q --specfile kexec-tools.spec
    kexec-tools-2.0.26-5.fc37.src
    # Fedora 36
    $ rpm -q --specfile kexec-tools.spec
    kexec-tools-2.0.26-5.fc36

The tests depends on rpm to generate correct RPM name. Fix this issue by
removing the trailing .src from the output of "rpm -q --specfile".

Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt;
---
 tests/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index 05fda1da..45688caf 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -30,7 +30,7 @@ RPMDEFINE = --define '_sourcedir $(REPO)'\
 
 KEXEC_TOOLS_SRC = $(filter-out $(REPO)/tests,$(wildcard $(REPO)/*))
 KEXEC_TOOLS_TEST_SRC = $(wildcard $(REPO)/tests/scripts/**/*)
-KEXEC_TOOLS_NVR = $(shell rpm $(RPMDEFINE) -q --specfile $(REPO)/$(SPEC) 2>/dev/null |
grep -m 1 .)
+KEXEC_TOOLS_NVR = $(shell rpm $(RPMDEFINE) -q --specfile $(REPO)/$(SPEC) 2>/dev/null |
grep -m 1 . | sed -e 's#.src#.$(ARCH)#')
 KEXEC_TOOLS_RPM = $(BUILD_ROOT)/$(ARCH)/$(KEXEC_TOOLS_NVR).rpm
 
 all: $(TEST_ROOT)/output/test-base-image
-- 
2.40.1

[PATCH 2/3] tests: skip checking if the second partition has the boot label

[Coiby Xu]

All the tests failed to run on the Fedora 37 host because the boot
partition failed to be mounted and in turn the key kernel cmdline
parameters like selinux=0 couldn't be added.

The root problem is somehow running lsblk on the second partition
returns an empty label unless we wait for enough time. Before figuring
out the root cause, simply skip check that the second partition
needs to have the boot label.

Note the root problem can be produced by building a test image,
    cd tests
    ./scripts/build-image.sh Fedora-Cloud-Base-37-1.7.x86_64.qcow2 output_image  
scripts/build-scripts/base-image_test.sh
    Source image is qcow2, using snapshot...
    Formatting 'build/base-image1.building', fmt=qcow2 cluster_size=65536
extended_l2=off compression_type=zlib size=5368709120
backing_file=Fedora-Cloud-Base-37-1.7.x86_64.qcow2 backing_fmt=qcow2 lazy_refcounts=off
refcount_bits=16
    It's a image with multiple partitions, using last partition as main partition
    grep: /boot/grub2/grubenv: No such file or directory
    grub2-editenv: error: cannot open `/boot/grub2/grubenv.new': No such file or
directory.
    /dev/nbd0 disconnected

Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt;
---
 tests/scripts/image-init-lib.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/scripts/image-init-lib.sh b/tests/scripts/image-init-lib.sh
index 467f32f2..b0af7f8c 100644
--- a/tests/scripts/image-init-lib.sh
+++ b/tests/scripts/image-init-lib.sh
@@ -86,9 +86,9 @@ get_mountable_dev() {
 get_mount_boot() {
 	local dev=$1 _second_part=${dev}p2
 
-	if [[ $(lsblk -f $_second_part -n -o LABEL 2> /dev/null) == boot ]]; then
-		echo $_second_part
-	fi
+	# it's better to check if the 2nd partition has the boot label using lsblk
+	# but somehow this doesn't work starting with Fedora37
+	echo $_second_part
 }
 
 
-- 
2.40.1

[PATCH 3/3] tests: use the default crashkernel value

[Coiby Xu]

And with commit t5b31b099 ("Simplify the management of the kernel
parameter crashkernel"), the default crashkernel value will be
used for the kernel. But the test VM has a RAM of 768M thus this is no
actual reserved memory for kdump.  Even With the old crashkernel=224M,
network dumping tests like nfs-kdump will fail out of memory when
running against current Fedora Cloud images (>=F37).

This patch address the above two issues by
 1. increasing the RAM of test VM to 1G
 2. installing the kernel-modules which contains the squashfs module in
    order to use the dracut squash module for kdump initrd.

Thanks to the dracut squash module, now even crashkernel=192M (the
default crashkernel value for RAM between 1G and 4G) works for
network dumping. Another benefit brought by this change is the default
crashkernel value can be tested as well.

Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt;
---
 tests/scripts/build-scripts/base-image.sh | 3 +--
 tests/scripts/test-lib.sh                 | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/scripts/build-scripts/base-image.sh
b/tests/scripts/build-scripts/base-image.sh
index 62624e4e..1d64cfb5 100755
--- a/tests/scripts/build-scripts/base-image.sh
+++ b/tests/scripts/build-scripts/base-image.sh
@@ -3,8 +3,7 @@
 img_inst_pkg grubby\
 	dnsmasq\
 	openssh openssh-server\
-	dracut-network dracut-squash squashfs-tools ethtool snappy
+	dracut-network dracut-squash squashfs-tools ethtool snappy kernel-modules
 
 img_run_cmd "grubby --args systemd.journald.forward_to_console=1
systemd.log_target=console --update-kernel ALL"
 img_run_cmd "grubby --args selinux=0 --update-kernel ALL"
-img_run_cmd "grubby --args crashkernel=224M --update-kernel ALL"
diff --git a/tests/scripts/test-lib.sh b/tests/scripts/test-lib.sh
index 8b24b2ad..57b05d37 100644
--- a/tests/scripts/test-lib.sh
+++ b/tests/scripts/test-lib.sh
@@ -8,7 +8,7 @@
 DEFAULT_QEMU_CMD="-nodefaults \
 -nographic \
 -smp 2 \
--m 768M \
+-m 1G \
 -monitor none"
 
 _YELLOW='\033[1;33m'
-- 
2.40.1

[Philipp Rudo]

On Thu, 15 Jun 2023 13:17:19 +0800
Coiby Xu <coxu(a)redhat.com&gt; wrote:

>  Tests failed to run against Fedora 37 or newer cloud images because
> of
>  the following error,
>      It's a image with multiple partitions, using last partition as main partition
>      'xxx/tests/build/x86_64/kexec-tools-2.0.26-5.fc37.src.rpm' not found
>      /dev/nbd0 disconnected
>      make: *** [Makefile:73: xxx/tests/output/test-base-image] Error 1
>  
>  This is because starting with Fedora 37, rpm changes its API,
>      # Fedora >= 37
>      $ rpm -q --specfile kexec-tools.spec
>      kexec-tools-2.0.26-5.fc37.src
>      # Fedora 36
>      $ rpm -q --specfile kexec-tools.spec
>      kexec-tools-2.0.26-5.fc36
>  
>  The tests depends on rpm to generate correct RPM name. Fix this issue by
>  removing the trailing .src from the output of "rpm -q --specfile".
>  
>  Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt; 
For the series
Reviewed-by: Philipp Rudo <prudo(a)redhat.com&gt;

>  ---
>   tests/Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/tests/Makefile b/tests/Makefile
>  index 05fda1da..45688caf 100644
>  --- a/tests/Makefile
>  +++ b/tests/Makefile
>  @@ -30,7 +30,7 @@ RPMDEFINE = --define '_sourcedir $(REPO)'\
>   
>   KEXEC_TOOLS_SRC = $(filter-out $(REPO)/tests,$(wildcard $(REPO)/*))
>   KEXEC_TOOLS_TEST_SRC = $(wildcard $(REPO)/tests/scripts/**/*)
>  -KEXEC_TOOLS_NVR = $(shell rpm $(RPMDEFINE) -q --specfile $(REPO)/$(SPEC) 2>/dev/null
> | grep -m 1 .)
>  +KEXEC_TOOLS_NVR = $(shell rpm $(RPMDEFINE) -q --specfile $(REPO)/$(SPEC) 2>/dev/null
> | grep -m 1 . | sed -e 's#.src#.$(ARCH)#')
>   KEXEC_TOOLS_RPM = $(BUILD_ROOT)/$(ARCH)/$(KEXEC_TOOLS_NVR).rpm
>   
>   all: $(TEST_ROOT)/output/test-base-image

[Coiby Xu]

On Mon, Jun 19, 2023 at 05:40:42PM +0200, Philipp Rudo wrote:
> On Thu, 15 Jun 2023 13:17:19 +0800
> Coiby Xu <coxu(a)redhat.com&gt; wrote:
>
> > Tests failed to run against Fedora 37 or newer cloud images because of
> > the following error,
> >     It's a image with multiple partitions, using last partition as main
> partition
> >     'xxx/tests/build/x86_64/kexec-tools-2.0.26-5.fc37.src.rpm' not found
> >     /dev/nbd0 disconnected
> >     make: *** [Makefile:73: xxx/tests/output/test-base-image] Error 1
> >
> > This is because starting with Fedora 37, rpm changes its API,
> >     # Fedora >= 37
> >     $ rpm -q --specfile kexec-tools.spec
> >     kexec-tools-2.0.26-5.fc37.src
> >     # Fedora 36
> >     $ rpm -q --specfile kexec-tools.spec
> >     kexec-tools-2.0.26-5.fc36
> >
> > The tests depends on rpm to generate correct RPM name. Fix this issue by
> > removing the trailing .src from the output of "rpm -q --specfile".
> >
> > Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt;
>
> For the series
> Reviewed-by: Philipp Rudo <prudo(a)redhat.com&gt; 
Patch set merged, thanks for the review!

> > ---
> >  tests/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tests/Makefile b/tests/Makefile
> > index 05fda1da..45688caf 100644
> > --- a/tests/Makefile
> > +++ b/tests/Makefile
> > @@ -30,7 +30,7 @@ RPMDEFINE = --define '_sourcedir $(REPO)'\
> >
> >  KEXEC_TOOLS_SRC = $(filter-out $(REPO)/tests,$(wildcard $(REPO)/*))
> >  KEXEC_TOOLS_TEST_SRC = $(wildcard $(REPO)/tests/scripts/**/*)
> > -KEXEC_TOOLS_NVR = $(shell rpm $(RPMDEFINE) -q --specfile $(REPO)/$(SPEC)
> 2>/dev/null | grep -m 1 .)
> > +KEXEC_TOOLS_NVR = $(shell rpm $(RPMDEFINE) -q --specfile $(REPO)/$(SPEC)
> 2>/dev/null | grep -m 1 . | sed -e 's#.src#.$(ARCH)#')
> >  KEXEC_TOOLS_RPM = $(BUILD_ROOT)/$(ARCH)/$(KEXEC_TOOLS_NVR).rpm
> >
> >  all: $(TEST_ROOT)/output/test-base-image
>  
-- 
Best regards,
Coiby