From d3350efeebd57fcf140c8f1e46f6d715e58a83df Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 1 Sep 2024 03:38:00 +0000 Subject: [PATCH] Update CI files [noissue] --- .github/template_gitref | 2 +- .github/workflows/scripts/script.sh | 8 ++++---- functest_requirements.txt | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index 5df480f79..3e3784896 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 db80361bd..5fa65e7fc 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_container.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_container.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_container.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_container.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_container.tests.functional -m parallel -n 8" - cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_container.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_container.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_container.tests.functional -m 'not parallel'" fi fi pushd ../pulp-cli diff --git a/functest_requirements.txt b/functest_requirements.txt index d58e56db4..2bc2d8e43 100644 --- a/functest_requirements.txt +++ b/functest_requirements.txt @@ -1,3 +1,5 @@ pulp-smash @ git+https://github.com/pulp/pulp-smash.git pytest<8 python-gnupg +pytest-xdist +pytest-timeout