fix: address CI test failures and improve error handling

Address review comments from mmartinv regarding CI test failures:

1. **Fix Copr package installation issue**:
   - CI tests were installing greenboot from official repos instead of
     Copr because version numbers were identical
   - Changed 'dnf install' to 'dnf reinstall || dnf install' to force
     installation of PR build from Copr even when version matches
   - This ensures tests run against the actual PR code changes

2. **Improve error handling in check_previous_rollback()**:
   - Verify stderr contains expected "No journal boot entry found"
     message before treating journalctl failure as "no previous boot"
   - Return proper error for unexpected journalctl failures
   - Check for both empty output and "-- No entries --" message

3. **Simplify first boot test**:
   - Use 'journalctl -b 1' to get first boot logs instead of complex
     boot ID lookup (simpler and more reliable per journalctl man page)
   - Remove unnecessary failed_when check
   - Separate combined assertion into two distinct checks for clarity

Signed-off-by: Sarita Mahajan <sarmahaj@redhat.com>

Author: sarmahaj

src/main.rs

@@ -177,15 +177,25 @@ fn check_previous_rollback() -> Result<bool> {
         .context("Failed to execute journalctl command to check rollback status")?;
 
     if !output.status.success() {
-        log::info!(
-            "No previous boot journal available (expected on first boot or systems with non-persistent journal). Skipping rollback check."
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        // Check if failure is due to missing previous boot (expected on first boot)
+        if stderr.contains("No journal boot entry found for the specified boot") {
+            log::info!(
+                "No previous boot journal available (expected on first boot or systems with non-persistent journal). Skipping rollback check."
+            );
+            return Ok(false);
+        }
+        // For other failures, return an error
+        bail!(
+            "journalctl command failed with status: {}. stderr: {}",
+            output.status,
+            stderr.trim()
         );
-        return Ok(false);
     }
 
     let journal_output = String::from_utf8_lossy(&output.stdout);
 
-    if journal_output.trim().is_empty() {
+    if journal_output.trim().is_empty() || journal_output.contains("-- No entries --") {
         log::debug!("No rollback service logs found in previous boot");
         return Ok(false);
     }

tests/greenboot-bootc-anaconda-iso.sh

@@ -229,7 +229,7 @@ tee -a Containerfile >> /dev/null << EOF
 RUN (dnf install -y 'dnf5-command(copr)' || dnf install -y 'dnf-command(copr)') && \
     dnf copr enable -y packit/fedora-iot-greenboot-rs-${PR_NUMBER} ${COPR_CHROOT} && \
     dnf clean metadata && \
-    dnf install -y greenboot greenboot-default-health-checks && \
+    (dnf reinstall -y greenboot greenboot-default-health-checks || dnf install -y greenboot greenboot-default-health-checks) && \
     systemctl enable greenboot-healthcheck.service
 RUN sed -i "s/GREENBOOT_MAX_BOOT_ATTEMPTS=3/GREENBOOT_MAX_BOOT_ATTEMPTS=5/g" /etc/greenboot/greenboot.conf
 RUN sed -i 's#DISABLED_HEALTHCHECKS=()#DISABLED_HEALTHCHECKS=("01_repository_dns_check.sh" "not_exit.sh")#g' /etc/greenboot/greenboot.conf

tests/greenboot-bootc-qcow2.sh

@@ -229,7 +229,7 @@ tee -a Containerfile >> /dev/null << EOF
 RUN (dnf install -y 'dnf5-command(copr)' || dnf install -y 'dnf-command(copr)') && \
     dnf copr enable -y packit/fedora-iot-greenboot-rs-${PR_NUMBER} ${COPR_CHROOT} && \
     dnf clean metadata && \
-    dnf install -y greenboot greenboot-default-health-checks && \
+    (dnf reinstall -y greenboot greenboot-default-health-checks || dnf install -y greenboot greenboot-default-health-checks) && \
     systemctl enable greenboot-healthcheck.service
 RUN sed -i "s/GREENBOOT_MAX_BOOT_ATTEMPTS=3/GREENBOOT_MAX_BOOT_ATTEMPTS=5/g" /etc/greenboot/greenboot.conf
 RUN sed -i 's#DISABLED_HEALTHCHECKS=()#DISABLED_HEALTHCHECKS=("01_repository_dns_check.sh" "not_exit.sh")#g' /etc/greenboot/greenboot.conf

tests/greenboot-bootc.yaml

@@ -167,23 +167,22 @@
     # case: check proper first boot handling
     - name: check greenboot-healthcheck handles first boot correctly
       block:
-        - name: get earliest boot ID
-          shell: journalctl --list-boots --no-pager | awk '$2 ~ /^[0-9a-f]{32}$/{print $2; exit}'
-          become: yes
-          register: first_boot_id
-          failed_when: first_boot_id.stdout | length == 0
-
         - name: get greenboot-healthcheck log from first boot
-          command: "journalctl -b {{ first_boot_id.stdout }} -u greenboot-healthcheck.service --no-pager"
+          command: "journalctl -b 1 -u greenboot-healthcheck.service --no-pager"
           become: yes
           register: result_healthcheck_first_boot
 
         - assert:
             that:
               - "'No previous boot journal available' in result_healthcheck_first_boot.stdout"
+            fail_msg: "Expected first boot message not found"
+            success_msg: "First boot correctly detected with appropriate message"
+
+        - assert:
+            that:
               - "'FALLBACK BOOT DETECTED!' not in result_healthcheck_first_boot.stdout"
-            fail_msg: "Expected first boot message not found or false rollback detection on first boot"
-            success_msg: "First boot correctly detected with appropriate message and no false rollback detection"
+            fail_msg: "False rollback detection on first boot"
+            success_msg: "No false rollback detection on first boot"
 
       always:
         - set_fact:

tests/greenboot-ostree.yaml

@@ -74,23 +74,22 @@
     # case: check proper first boot handling
     - name: check greenboot-healthcheck handles first boot correctly
       block:
-        - name: get earliest boot ID
-          shell: journalctl --list-boots --no-pager | awk '$2 ~ /^[0-9a-f]{32}$/{print $2; exit}'
-          become: yes
-          register: first_boot_id
-          failed_when: first_boot_id.stdout | length == 0
-
         - name: get greenboot-healthcheck log from first boot
-          command: "journalctl -b {{ first_boot_id.stdout }} -u greenboot-healthcheck.service --no-pager"
+          command: "journalctl -b 1 -u greenboot-healthcheck.service --no-pager"
           become: yes
           register: result_healthcheck_first_boot
 
         - assert:
             that:
               - "'No previous boot journal available' in result_healthcheck_first_boot.stdout"
+            fail_msg: "Expected first boot message not found"
+            success_msg: "First boot correctly detected with appropriate message"
+
+        - assert:
+            that:
               - "'FALLBACK BOOT DETECTED!' not in result_healthcheck_first_boot.stdout"
-            fail_msg: "Expected first boot message not found or false rollback detection on first boot"
-            success_msg: "First boot correctly detected with appropriate message and no false rollback detection"
+            fail_msg: "False rollback detection on first boot"
+            success_msg: "No false rollback detection on first boot"
 
       always:
         - set_fact: