From 5a2bc614ca1816ddf6c6459b965f2abff32279e2 Mon Sep 17 00:00:00 2001 From: Bruno Goncalves Date: Dec 01 2020 13:05:59 +0000 Subject: standard-test-basic and standard-test-beakerlib set default test case timeout to 4hrs setting the default to 4hrs to be compatible with old pipeline implementation that limited playbook execution to 4hrs, so this should not cause any regression to existing playbooks. fix: https://pagure.io/standard-test-roles/issue/394 --- diff --git a/roles/standard-test-basic/README.md b/roles/standard-test-basic/README.md index f952321..0b6dc3b 100644 --- a/roles/standard-test-basic/README.md +++ b/roles/standard-test-basic/README.md @@ -22,7 +22,7 @@ to run testing. You can redefine the following variables in * **dir**: test directory. default: is the test name * **run**: command to run the test. default: ./runtest.sh - * **timeout**: abort test case after this time. More details on [timeout][1]. default: 0 + * **timeout**: abort test case after this time. More details on [timeout][1]. default: 4h * **save_files**: List of extra files to save to artifacts. Path to the file is relative to test directory. The files are saved to artifacts under test name directory. default: None diff --git a/roles/standard-test-basic/tasks/main.yml b/roles/standard-test-basic/tasks/main.yml index e8725cd..6162ff4 100644 --- a/roles/standard-test-basic/tasks/main.yml +++ b/roles/standard-test-basic/tasks/main.yml @@ -21,7 +21,7 @@ item[(item.keys()|list)[0]]['dir']|default((item.keys()|list)[0]) }}" \ --artifactsdir "{{ remote_artifacts }}" \ --test "{{ item if item.keys is not defined else (item.keys()|list)[0] }}" \ - --timeout "{{ '0' if item.keys is not defined else + --timeout "{{ '4h' if item.keys is not defined else item[(item.keys()|list)[0]]['timeout']|default('0') }}" \ --cmd "{{ './runtest.sh' if item.keys is not defined else item[(item.keys()|list)[0]]['run']|default('./runtest.sh') | regex_replace('\\', '\\\\') | diff --git a/roles/standard-test-beakerlib/README.md b/roles/standard-test-beakerlib/README.md index 8059c4e..bac384f 100644 --- a/roles/standard-test-beakerlib/README.md +++ b/roles/standard-test-beakerlib/README.md @@ -26,7 +26,7 @@ testing. You can redefine the following variables in ## Test case parameters - * **timeout**: abort test case after this time. More details on [timeout][2]. default: 0 + * **timeout**: abort test case after this time. More details on [timeout][2]. default: 4h Example usage: diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml index 8c4e86b..0de1d1b 100644 --- a/roles/standard-test-beakerlib/tasks/main.yml +++ b/roles/standard-test-beakerlib/tasks/main.yml @@ -56,7 +56,7 @@ script: run-beakerlib-test --workdir {{ tenv_workdir }} \ --artifactsdir {{ remote_artifacts }} \ --test "{{ item if item.keys is not defined else (item.keys()|list)[0] }}" \ - --timeout "{{ '0' if item.keys is not defined else + --timeout "{{ '4h' if item.keys is not defined else item[(item.keys()|list)[0]]['timeout']|default('0') }}" with_items: - "{{ tests }}"