Merge pull request fedora-iot#149 from yih-redhat/fix-ostree

ci: fix cs9 ostree test error

Author: say-paul

tests/greenboot-bootc.yaml

@@ -107,7 +107,7 @@
 
         - assert:
             that:
-              - "'FALLBACK BOOT DETECTED! Default bootc deployment has been rolled back' in result_greenboot_log.stdout"
+              - "'FALLBACK BOOT DETECTED!' in result_greenboot_log.stdout"
             fail_msg: "Fallback log not found"
             success_msg: "Found fallback log"
 

tests/greenboot-ostree.sh

@@ -320,6 +320,8 @@ version = "*"
 name = "sssd"
 version = "*"
 
+[customizations.services]
+enabled = ["greenboot-set-rollback-trigger.service", "greenboot-success.target"]
 
 [[customizations.user]]
 name = "${SSH_USER}"

tests/greenboot-ostree.yaml

@@ -12,19 +12,18 @@
     - debug: var=ansible_facts['distribution']
     - debug: var=ansible_facts['architecture']
 
-    # case: check installed greenboot packages
-    - name: greenboot should be installed
+    # case: check greenboot* services
+    - name: greenboot healthcheck service should be enabled
       block:
-        - name: greenboot should be installed
-          shell: rpm -qa | grep greenboot
-          register: result_greenboot_packages
+        - name: greenboot healthcheck service should be enabled
+          command: systemctl is-enabled greenboot-healthcheck
+          register: result_greenboot_service
 
         - assert:
             that:
-              - "'greenboot-0' in result_greenboot_packages.stdout"
-              - "'greenboot-default-health-checks' in result_greenboot_packages.stdout"
-            fail_msg: "greenboot is not installed"
-            success_msg: "greenboot is installed"
+              - result_greenboot_service.stdout == 'enabled'
+            fail_msg: "at least one greenboot service is not enabled"
+            success_msg: "greenboot services are enabled"
       always:
         - set_fact:
             total_counter: "{{ total_counter | int + 1 }}"
@@ -33,18 +32,18 @@
           set_fact:
             failed_counter: "{{ failed_counter | int + 1 }}"
 
-    # case: check greenboot* services
-    - name: a list of greenboot* service should be enabled
+      # case: check greenboot* service status
+    - name: greenboot healthcheck service should be active
       block:
-        - name: a list of greenboot* service should be enabled
-          command: systemctl is-enabled greenboot-grub2-set-counter greenboot-grub2-set-success greenboot-healthcheck greenboot-rpm-ostree-grub2-check-fallback greenboot-status greenboot-task-runner redboot-auto-reboot redboot-task-runner
-          register: result_greenboot_service
+        - name: greenboot healthcheck service should be active
+          command: systemctl is-active greenboot-healthcheck.service
+          register: result_greenboot_active
 
         - assert:
             that:
-              - result_greenboot_service.stdout == 'enabled\nenabled\nenabled\nenabled\nenabled\nenabled\nenabled\nenabled'
-            fail_msg: "at least one greenboot service is not enabled"
-            success_msg: "greenboot services are enabled"
+              - result_greenboot_active.stdout == "active"
+            fail_msg: "greenboot healthcheck service is not active"
+            success_msg: "greenboot healthcheck service is active"
       always:
         - set_fact:
             total_counter: "{{ total_counter | int + 1 }}"
@@ -53,55 +52,17 @@
           set_fact:
             failed_counter: "{{ failed_counter | int + 1 }}"
 
-    # case: check greenboot* services log
-    - name: all greenboot* service should run without error
+    # case: check boot-complete.target status
+    - name: boot-complete.target should be active
       block:
-        # check service/target status instead of string matching messages
         - name: check boot-complete.target
-          # will fail if the target was not reached
           command: systemctl --no-pager status boot-complete.target
+          become: yes
           register: result
           retries: 10
           delay: 60
           until: "'inactive' not in result.stdout"
 
-        - name: all greenboot* service should run without error
-          command: journalctl -b -0 -u greenboot -u greenboot-healthcheck -u greenboot-rpm-ostree-grub2-check-fallback -u greenboot-grub2-set-counter -u greenboot-grub2-set-success -u greenboot-status -u redboot -u redboot-auto-reboot -u redboot.target
-          become: yes
-          register: result_greenboot_log
-
-        - assert:
-            that:
-              - "'Script \\'00_required_scripts_start.sh\\' SUCCESS' in result_greenboot_log.stdout"
-              - "'Script \\'00_wanted_scripts_start.sh\\' SUCCESS' in result_greenboot_log.stdout"
-              - "'greenboot Health Checks Runner' in result_greenboot_log.stdout"
-              - "'Mark boot as successful in grubenv' in result_greenboot_log.stdout"
-              - "'Boot Status is GREEN - Health Check SUCCESS' in result_greenboot_log.stdout"
-              - "'greenboot MotD Generator' in result_greenboot_log.stdout"
-            fail_msg: "Some errors happened in service boot"
-            success_msg: "All greenboot services booted success"
-
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
-
-    # case: check grubenv variables
-    - name: grubenv variables should contain boot_success=1
-      block:
-        - name: grubenv variables should contain boot_success=1
-          command: grub2-editenv list
-          register: result_grubenv
-          become: yes
-
-        - assert:
-            that:
-              - "'boot_success=1' in result_grubenv.stdout"
-            fail_msg: "Not found boot_success=1"
-            success_msg: "Found boot_success=1"
       always:
         - set_fact:
             total_counter: "{{ total_counter | int + 1 }}"
@@ -156,33 +117,17 @@
           set_fact:
             failed_counter: "{{ failed_counter | int + 1 }}"
 
-    # case: check greenboot* services log again
+    # case: check fallback log
     - name: fallback log should be found here
       block:
-        # check service/target status instead of string matching messages
-        - name: check boot-complete.target
-          # will fail if the target was not reached
-          command: systemctl --no-pager status boot-complete.target
-          become: yes
-          register: result
-          retries: 10
-          delay: 60
-          until: "'inactive' not in result.stdout"
-
         - name: fallback log should be found here
-          command: journalctl -b -0 -u greenboot -u greenboot-healthcheck -u greenboot-rpm-ostree-grub2-check-fallback -u greenboot-grub2-set-counter -u greenboot-grub2-set-success -u greenboot-status -u redboot -u redboot-auto-reboot -u redboot.target
+          command: journalctl -b -0 -u greenboot -u greenboot-healthcheck
           become: yes
           register: result_greenboot_log
 
         - assert:
             that:
-              - "'FALLBACK BOOT DETECTED! Default rpm-ostree deployment has been rolled back' in result_greenboot_log.stdout"
-              - "'Script \\'00_required_scripts_start.sh\\' SUCCESS' in result_greenboot_log.stdout"
-              - "'Script \\'00_wanted_scripts_start.sh\\' SUCCESS' in result_greenboot_log.stdout"
-              - "'greenboot Health Checks Runner' in result_greenboot_log.stdout"
-              - "'Mark boot as successful in grubenv' in result_greenboot_log.stdout"
-              - "'Boot Status is GREEN - Health Check SUCCESS' in result_greenboot_log.stdout"
-              - "'greenboot MotD Generator' in result_greenboot_log.stdout"
+              - "'FALLBACK BOOT DETECTED!' in result_greenboot_log.stdout"
             fail_msg: "Fallback log not found"
             success_msg: "Found fallback log"