[PATCH 0/2] vmlinuz/initrd for the same MACHINE are overwritten

[PATCH 0/2] vmlinuz/initrd for the same MACHINE are overwritten

[Maxim Yu. Osipov]

Hi,

The first patch fixes issue #56. 

The problems were detected by standard "overnight" CI. 
Add the test case to detect such kind of problems by "fast" CI.

Regards,
Maxim.

Maxim Yu. Osipov (2):
  Revert "image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable
    fixed"
  ci: Include qemuarm-buster into fast build/vm_smoke_test

 meta/classes/image.bbclass | 6 ++++--
 scripts/ci_build.sh        | 1 +
 scripts/vm_smoke_test      | 4 +---
 3 files changed, 6 insertions(+), 5 deletions(-)

-- 
2.11.0

[PATCH 1/2] Revert "image.bbclass: make KERNEL_IMAGE & INITRD_IMAGE variable fixed"

[Maxim Yu. Osipov]

This reverts commit b92589c574596ac98f97cf14369cbf62872e6481.

vmlinuz and initrd are getting overwritten for the same machine
by other distros under deploy/images/${MACHINE}

Closes: #56
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
 meta/classes/image.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f9a3052..f265099 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -13,8 +13,8 @@ IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getV
 IMAGE_FULLNAME = "${PF}"
 
 # These variables are used by wic and start_vm
-KERNEL_IMAGE ?= "vmlinuz"
-INITRD_IMAGE ?= "initrd.img"
+KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}"
+INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}"
 
 # Useful variables for imager implementations:
 PP = "/home/builder/${PN}"
@@ -149,10 +149,12 @@ addtask rootfs_install before do_build after do_unpack
 
 do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}"
 do_copy_boot_files() {
+    KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')[1]}
     if [ -n "${KERNEL_IMAGE}" ]; then
         cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'vmlinuz')[0]} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}
     fi
 
+    INITRD_IMAGE=${@get_image_name(d, 'initrd.img')[1]}
     if [ -n "${INITRD_IMAGE}" ]; then
         sudo cp -f ${IMAGE_ROOTFS}/boot/${@get_image_name(d, 'initrd.img')[0]} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}
     fi
-- 
2.11.0

[PATCH 2/2] ci: Include qemuarm-buster into fast build/vm_smoke_test

[Maxim Yu. Osipov]

Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
 scripts/ci_build.sh   | 1 +
 scripts/vm_smoke_test | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index df751d3..a38e2b7 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -83,6 +83,7 @@ do
         CROSS_BUILD="1"
         TARGETS_SET="\
                      multiconfig:qemuarm-stretch:isar-image-base \
+                     multiconfig:qemuarm-buster:isar-image-base \
                      multiconfig:qemuarm64-stretch:isar-image-base \
                      multiconfig:qemuamd64-stretch:isar-image-base \
                      multiconfig:rpi-stretch:isar-image-base"
diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
index 6e28d54..237205e 100755
--- a/scripts/vm_smoke_test
+++ b/scripts/vm_smoke_test
@@ -146,10 +146,8 @@ do
 done
 
 # ARM machine
-if [ -z "$FAST_BUILD" ]; then
-    run_test arm buster
-fi
 run_test arm stretch
+run_test arm buster
 
 # AMD64 machine
 if [ -z "$FAST_BUILD" ]; then
-- 
2.11.0