From 66db3e3dd78a5033f179c48d8f4cd5bf370ebeac Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 1 Sep 2024 02:04:37 +0000 Subject: [PATCH] Update CI files [noissue] --- .github/template_gitref | 2 +- .github/workflows/scripts/script.sh | 8 ++++---- functest_requirements.txt | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index 5df480f..3e37848 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-378-g72f4b38 +2021.08.26-379-gece49c9 diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 925da27..344a8a2 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -128,11 +128,11 @@ if [ -f "$FUNC_TEST_SCRIPT" ]; then else if [[ "$GITHUB_WORKFLOW" =~ "Nightly" ]] then - cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_gem.tests.functional -m parallel -n 8 --nightly" - cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_gem.tests.functional -m 'not parallel' --nightly" + cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_gem.tests.functional -m parallel -n 8 --nightly" + cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_gem.tests.functional -m 'not parallel' --nightly" else - cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_gem.tests.functional -m parallel -n 8" - cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_gem.tests.functional -m 'not parallel'" + cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_gem.tests.functional -m parallel -n 8" + cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_gem.tests.functional -m 'not parallel'" fi fi pushd ../pulp-cli-gem diff --git a/functest_requirements.txt b/functest_requirements.txt index 4f00334..0609685 100644 --- a/functest_requirements.txt +++ b/functest_requirements.txt @@ -5,3 +5,4 @@ pytest<8 pytest-custom_exit_code pytest-xdist trustme +pytest-timeout