Skip to content

Commit f622df1

Browse files
Drop in-playbook fail; let ci-framework report UNSTABLE
Remove the final ocp_testing play and fail_if_test_stage_unstable task. Testing stages still write test_stage_unstable_flag; the ci-framework shiftstack role fails after artifact rsync when that flag is present. Pair with ci-framework-jobs failure-message: unstable so monolithic Zuul jobs show yellow on test failures instead of green or red FAILURE. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 6812c42 commit f622df1

3 files changed

Lines changed: 3 additions & 41 deletions

File tree

collection/tools/roles/tools_stage_results/tasks/fail_if_test_stage_unstable.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

configs/global.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ report_dir: "{{ artifacts_dir }}/test_results"
3333
# Sets the Ansible Controller Node machine's HOME environment variable
3434
controller_home_dir: "{{ lookup('ansible.builtin.env', 'HOME') }}"
3535
# The resources_file and stage_unstable flags are on the Ansible control node's HOME.
36-
# test_stage_unstable_flag is written only by testing-stage rescues; ocp_testing.yaml
37-
# fails at the end if it exists so Zuul can report UNSTABLE for test failures.
36+
# test_stage_unstable_flag is written only by testing-stage rescues. The ci-framework
37+
# shiftstack role fails the Zuul job when this file is present in rsynced artifacts;
38+
# pair with failure-message: unstable on monolithic shiftstack Zuul jobs for yellow UI.
3839
# stage_unstable_flag is used by soft verification/install workarounds (no end-of-run fail).
3940
resources_file: "{{ controller_home_dir }}/artifacts/resources.yml"
4041
stage_unstable_flag: "{{ controller_home_dir }}/artifacts/stage_unstable_flag"

playbooks/ocp_testing.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,3 @@
124124
- name: Run EgressIP tests on OpenShift
125125
ansible.builtin.import_playbook: plays/egressip_tests.yaml
126126
when: "'egressip_tests' in stages"
127-
128-
- name: Fail if any testing stage was marked UNSTABLE
129-
hosts: localhost
130-
gather_facts: false
131-
vars_files:
132-
- "../configs/global.yml"
133-
tasks:
134-
- name: Check accumulated UNSTABLE testing stages and fail the playbook
135-
ansible.builtin.include_role:
136-
name: tools_stage_results
137-
tasks_from: fail_if_test_stage_unstable.yml

0 commit comments

Comments
 (0)