tests: fix tests with the tranfering logic

Author: HuijingHei

.github/workflows/ci.yml

@@ -99,4 +99,4 @@ jobs:
       - name: bootupctl generate-update-metadata
         run: |
           set -xeuo pipefail
-          sudo podman run --rm -v $PWD:/run/src -w /run/src --privileged localhost/bootupd:latest tests/tests/move-content-to-usr.sh
+          sudo podman run --rm -v $PWD:/run/src -w /run/src --privileged localhost/bootupd:latest tests/tests/generate-update-metadata.sh

tests/e2e-update/e2e-update-in-vm.sh

@@ -18,9 +18,9 @@ if ! test -f ${stampfile}; then
         fatal "already at ${TARGET_COMMIT}"
     fi
 
-    current_grub=$(rpm -q --queryformat='%{nevra}\n' ${TARGET_GRUB_NAME})
-    if test "${current_grub}" == "${TARGET_GRUB_PKG}"; then
-        fatal "Current grub ${current_grub} is same as target ${TARGET_GRUB_PKG}"
+    current_grub=$(rpm -q --queryformat='%{evr}\n' ${TARGET_GRUB_NAME})
+    if test "${current_grub}" == "${TARGET_GRUB_EVR}"; then
+        fatal "Current grub ${current_grub} is same as target ${TARGET_GRUB_EVR}"
     fi
 
     # FIXME
@@ -44,20 +44,20 @@ if test "$semode" != Enforcing; then
     fatal "SELinux mode is ${semode}"
 fi
 
-if ! test -n "${TARGET_GRUB_PKG}"; then
-    fatal "Missing TARGET_GRUB_PKG"
+if ! test -n "${TARGET_GRUB_EVR}"; then
+    fatal "Missing TARGET_GRUB_EVR"
 fi
 
 bootupctl validate
 ok validate
 
 bootupctl status | tee out.txt
 assert_file_has_content_literal out.txt 'Component EFI'
-assert_file_has_content_literal out.txt '  Installed: grub2-efi-x64-'
-assert_not_file_has_content out.txt '  Installed:.*test-bootupd-payload'
-assert_not_file_has_content out.txt '  Installed:.*'"${TARGET_GRUB_PKG}"
-assert_file_has_content out.txt 'Update: Available:.*'"${TARGET_GRUB_PKG}"
-assert_file_has_content out.txt 'Update: Available:.*test-bootupd-payload-1.0'
+assert_file_has_content_literal out.txt '  Installed: grub2-1:'
+assert_not_file_has_content out.txt '  Installed:.*test_bootupd_payload'
+assert_not_file_has_content out.txt '  Installed:.*'"${TARGET_GRUB_EVR}"
+assert_file_has_content out.txt 'Update: Available:.*'"${TARGET_GRUB_EVR}"
+assert_file_has_content out.txt 'Update: Available:.*test_bootupd_payload-1.0'
 bootupctl status --print-if-available > out.txt
 assert_file_has_content_literal 'out.txt' 'Updates available: BIOS EFI'
 ok update avail
@@ -74,7 +74,7 @@ assert_file_has_content err.txt "error: .*synthetic failpoint"
 
 bootupctl update -vvv | tee out.txt
 assert_file_has_content out.txt "Previous EFI: .*"
-assert_file_has_content out.txt "Updated EFI: ${TARGET_GRUB_PKG}.*,test-bootupd-payload-1.0"
+assert_file_has_content out.txt "Updated EFI: .*${TARGET_GRUB_EVR}.*,test_bootupd_payload-1.0"
 
 assert_file_has_content ${tmpefimount}/EFI/fedora/test-bootupd.efi test-payload
 

tests/e2e-update/e2e-update.sh

@@ -25,7 +25,7 @@ export test_tmpdir=${testtmp}
 # This is new content for our update
 test_bootupd_payload_file=/boot/efi/EFI/fedora/test-bootupd.efi
 test_bootupd_payload_file1=/boot/efi/EFI/BOOT/test-bootupd1.efi
-build_rpm test-bootupd-payload \
+build_rpm test_bootupd_payload \
   files "${test_bootupd_payload_file}
          ${test_bootupd_payload_file1}" \
   install "mkdir -p %{buildroot}/$(dirname ${test_bootupd_payload_file})
@@ -56,9 +56,9 @@ if test -z "${e2e_skip_build:-}"; then
     runv cosa build
     runv cosa osbuild qemu
     prev_image=$(runv cosa meta --image-path qemu)
-    # Modify manifest to include `test-bootupd-payload` RPM
+    # Modify manifest to include `test_bootupd_ayload` RPM
     runv git -C src/config checkout manifest.yaml # first make sure it's clean
-    echo "packages: [test-bootupd-payload]" >> src/config/manifest.yaml
+    echo "packages: [test_bootupd_payload]" >> src/config/manifest.yaml
     rm -f ${overrides}/rpm/*.rpm
     echo "Building update ostree"
     # Latest (current) version in F42
@@ -77,7 +77,7 @@ case $(arch) in
     *) fatal "Unhandled arch $(arch)";;
 esac
 target_grub_name=grub2-efi-${grubarch}
-target_grub_pkg=$(rpm -qp --queryformat='%{nevra}\n' ${overrides}/rpm/${target_grub_name}-2*.rpm)
+target_grub_evr=$(rpm -qp --queryformat='%{evr}\n' ${overrides}/rpm/${target_grub_name}-2*.rpm)
 target_commit=$(cosa meta --get-value ostree-commit)
 echo "Target commit: ${target_commit}"
 # For some reason 9p can't write to tmpfs
@@ -97,7 +97,7 @@ systemd:
         RemainAfterExit=yes
         Environment=TARGET_COMMIT=${target_commit}
         Environment=TARGET_GRUB_NAME=${target_grub_name}
-        Environment=TARGET_GRUB_PKG=${target_grub_pkg}
+        Environment=TARGET_GRUB_EVR=${target_grub_evr}
         Environment=SRCDIR=/run/bootupd-source
         # Run via shell because selinux denies systemd writing to 9p apparently
         ExecStart=/bin/sh -c '/run/bootupd-source/${testprefix}/e2e-update-in-vm.sh &>>/run/testtmp/out.txt; test -f /run/rebooting || poweroff -ff'

tests/kola/test-bootupd

@@ -41,8 +41,9 @@ prepare_efi_update() {
 }
 
 bootupctl status > out.txt
+evr=$(rpm -q grub2-common --qf '%{EVR}')
 assert_file_has_content_literal out.txt 'Component EFI'
-assert_file_has_content_literal out.txt '  Installed: grub2-efi-x64-'
+assert_file_has_content_literal out.txt '  Installed: grub2-'"${evr}"
 assert_file_has_content_literal out.txt 'Update: At latest version'
 assert_file_has_content out.txt '^CoreOS aleph version:'
 ok status
@@ -78,21 +79,21 @@ mv new.json ${bootupdir}/EFI.json
 
 bootupctl status | tee out.txt
 assert_file_has_content_literal out.txt 'Component EFI'
-assert_file_has_content_literal out.txt '  Installed: grub2-efi-x64-'
-assert_not_file_has_content out.txt '  Installed: grub2-efi-x64.*,test'
+assert_file_has_content_literal out.txt '  Installed: grub2-'"${evr}"
+assert_not_file_has_content out.txt '  Installed: grub2-.*,test'
 assert_file_has_content_literal out.txt 'Update: Available:'
 ok update avail
 
 bootupctl status --json > status.json
 jq -r '.components.EFI.installed.version' < status.json > installed.txt
-assert_file_has_content installed.txt '^grub2-efi-x64'
+assert_file_has_content installed.txt '^grub2-'"${evr}"
 
 bootupctl update | tee out.txt
-assert_file_has_content out.txt 'Updated EFI: grub2-efi-x64.*,test'
+assert_file_has_content out.txt 'Updated EFI: grub2-.*,test'
 
 bootupctl status > out.txt
 assert_file_has_content_literal out.txt 'Component EFI'
-assert_file_has_content out.txt '  Installed: grub2-efi-x64.*,test'
+assert_file_has_content out.txt '  Installed: grub2-.*,test'
 assert_file_has_content_literal out.txt 'Update: At latest version'
 ok status after update
 

tests/tests/generate-update-metadata.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -xeuo pipefail
+
+updates=/usr/lib/bootupd/updates
+rm -fv ${updates}/{BIOS,EFI}.json
+if [ -d "/usr/lib/efi" ]; then
+  rm -rfv ${updates}/EFI
+else
+  mv ${updates}/EFI /usr/lib/ostree-boot/efi
+fi
+# Run generate-update-metadata
+bootupctl backend generate-update-metadata -vvv
+cat ${updates}/EFI.json | jq
+
+# Verify the bootupd EFI has more than one component installed
+version=$(cat ${updates}/EFI.json | jq -r .version | tr ',' ' ')
+array=($version)
+[ ${#array[*]} -gt 1 ]
+
+[ $(cat ${updates}/EFI.json | jq '.versions | length') -gt 1 ]