test: Skip rollback test only on UEFI VM of ostree-rebase.sh
This commit is contained in:
parent
45ee6c297f
commit
05cbbf0cc5
2 changed files with 12 additions and 4 deletions
|
|
@ -601,7 +601,7 @@ ansible_ssh_common_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/
|
|||
EOF
|
||||
|
||||
# Test IoT/Edge OS
|
||||
sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=rhel-edge -e ostree_commit="${UPGRADE_HASH}" -e ostree_ref="rhel-edge:${OSTREE_REF}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0
|
||||
sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=rhel-edge -e ostree_commit="${UPGRADE_HASH}" -e ostree_ref="rhel-edge:${OSTREE_REF}" -e skip_rollback_test="true" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0
|
||||
check_result
|
||||
|
||||
# Final success clean up
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
become: no
|
||||
vars:
|
||||
workspace: "{{ lookup('env', 'WORKSPACE') }}"
|
||||
skip_rollback_test: "false"
|
||||
total_counter: "0"
|
||||
failed_counter: "0"
|
||||
|
||||
|
|
@ -535,6 +536,7 @@
|
|||
- name: failed count + 1
|
||||
set_fact:
|
||||
failed_counter: "{{ failed_counter | int + 1 }}"
|
||||
when: skip_rollback_test == "false"
|
||||
|
||||
# case: check ostree commit after rollback
|
||||
- name: check ostree commit after rollback
|
||||
|
|
@ -559,7 +561,9 @@
|
|||
- name: failed count + 1
|
||||
set_fact:
|
||||
failed_counter: "{{ failed_counter | int + 1 }}"
|
||||
when: result_rollback is succeeded
|
||||
when:
|
||||
- skip_rollback_test == "false"
|
||||
- result_rollback is succeeded
|
||||
|
||||
# case: check greenboot* services log again
|
||||
- name: fallback log should be found here
|
||||
|
|
@ -588,7 +592,9 @@
|
|||
- name: failed count + 1
|
||||
set_fact:
|
||||
failed_counter: "{{ failed_counter | int + 1 }}"
|
||||
when: result_rollback is succeeded
|
||||
when:
|
||||
- skip_rollback_test == "false"
|
||||
- result_rollback is succeeded
|
||||
|
||||
# case: check grubenv variables again
|
||||
- name: grubenv variables should contain boot_success=1
|
||||
|
|
@ -610,7 +616,9 @@
|
|||
- name: failed count + 1
|
||||
set_fact:
|
||||
failed_counter: "{{ failed_counter | int + 1 }}"
|
||||
when: result_rollback is succeeded
|
||||
when:
|
||||
- skip_rollback_test == "false"
|
||||
- result_rollback is succeeded
|
||||
|
||||
- assert:
|
||||
that:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue