Skip to content

Commit

Permalink
Move Tobiko tests to be performed after other, non-disruptive, thests.
Browse files Browse the repository at this point in the history
  • Loading branch information
Julia Marciano authored and openshift-merge-bot[bot] committed Sep 13, 2024
1 parent 9ce85a9 commit f019921
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ docs/dictionary/tmp
.vscode
.venv/*
.env
.idea/
25 changes: 13 additions & 12 deletions roles/test_operator/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,18 +144,6 @@
ansible.builtin.include_tasks: run-test-operator-job.yml
when: run_tempest

- name: Run tobiko job
vars:
run_test_fw: tobiko
test_operator_config: "{{ cifmw_test_operator_tobiko_config }}"
test_operator_job_name: "{{ cifmw_test_operator_tobiko_name }}"
test_operator_kind_name: "{{ cifmw_test_operator_tobiko_kind_name }}"
test_operator_crd_name: "{{ cifmw_test_operator_tobiko_crd_name }}"
test_operator_workflow: "{{ cifmw_test_operator_tobiko_workflow }}"
test_operator_config_playbook: tobiko-tests.yml
ansible.builtin.include_tasks: run-test-operator-job.yml
when: run_tobiko

- name: Run ansibletest job
vars:
run_test_fw: ansibletest
Expand All @@ -178,6 +166,19 @@
ansible.builtin.include_tasks: run-test-operator-job.yml
when: run_horizontest

# Since Tobiko may include disruptive tests (faults), it is better to execute it at the end
- name: Run tobiko job
vars:
run_test_fw: tobiko
test_operator_config: "{{ cifmw_test_operator_tobiko_config }}"
test_operator_job_name: "{{ cifmw_test_operator_tobiko_name }}"
test_operator_kind_name: "{{ cifmw_test_operator_tobiko_kind_name }}"
test_operator_crd_name: "{{ cifmw_test_operator_tobiko_crd_name }}"
test_operator_workflow: "{{ cifmw_test_operator_tobiko_workflow }}"
test_operator_config_playbook: tobiko-tests.yml
ansible.builtin.include_tasks: run-test-operator-job.yml
when: run_tobiko

- name: Delete all resources created by the role
ansible.builtin.include_tasks: cleanup.yml
when: cifmw_test_operator_cleanup | bool and not cifmw_test_operator_dry_run | bool
Expand Down

0 comments on commit f019921

Please sign in to comment.