From d865b92cfb25cfb33a37f135289d72ac061b4843 Mon Sep 17 00:00:00 2001 From: Julia Marciano Date: Wed, 11 Sep 2024 14:57:21 +0300 Subject: [PATCH] Move Tobiko tests to be performed after other, non-disruptive, thests. --- .gitignore | 1 + roles/test_operator/tasks/main.yml | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 1e374d5c90..27e66f9c45 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ docs/dictionary/tmp .vscode .venv/* .env +.idea/ diff --git a/roles/test_operator/tasks/main.yml b/roles/test_operator/tasks/main.yml index d11da00bab..b745d7da2c 100644 --- a/roles/test_operator/tasks/main.yml +++ b/roles/test_operator/tasks/main.yml @@ -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 @@ -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