tests: minor fix for client-layering-upgrade

Xerf to Jonathan's comment coreos#4806 (comment)
HuijingHei · Feb 2, 2024 · 401b28e · 401b28e
1 parent aa4caed
commit 401b28e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
@@ -83,6 +83,6 @@ cosaPod(runAsUser: 0, memory: "${mem}Mi", cpu: "${nhosts}") {
       coreos-installer download -p qemu -f qcow2.xz -s testing --decompress
       mv rpm-ostree-[0-9]*.rpm rpm-ostree-libs-[0-9]*.rpm /usr/lib/coreos-assembler/tests/kola/rpm-ostree/destructive/data/      
     """)
-    kola(cosaDir: "${env.WORKSPACE}", extraArgs: "--qemu-image ./fedora-coreos*.qcow2 --tag rpm-ostree-upgrade ext.rpm-ostree.destructive.client-layering-upgrade")
+    kola(cosaDir: "${env.WORKSPACE}", skipUpgrade: true, extraArgs: "--qemu-image ./fedora-coreos*.qcow2 --tag rpm-ostree-upgrade")
   }
 }
diff --git a/tests/kolainst/destructive/client-layering-upgrade b/tests/kolainst/destructive/client-layering-upgrade
@@ -91,7 +91,7 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
     ;;
   "1")
     client_side_layering_checking
-    echo "ok client-side layering tests and upgrade rpm-ostree"
+    echo "ok layering tests and upgrade rpm-ostree"
 
     checksum=$(rpm-ostree status --json | jq -r '.deployments[0]."base-checksum"')
     ostree refs ${checksum} --create kola
@@ -101,6 +101,8 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
     ;;
   "2")
     client_side_layering_checking
+    booted_ref=$(rpm-ostree status --json | jq -r '.deployments[0].origin')
+    test "kola" == ${booted_ref}
     echo "ok upgrade to another update"
     ;;
   *) echo "unexpected mark: ${AUTOPKGTEST_REBOOT_MARK}"; exit 1;;