diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 321ae9942..958aceba7 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -142,9 +142,16 @@ else cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --durations=20 --pyargs pulp_container.tests.functional -m 'not parallel'" fi fi +# some pulp-cli tests use the api root envvar +export PULP_API_ROOT="$(EDITOR=cat pulp config edit 2>/dev/null | awk -F'"' '/api_root/{print $2; exit}')" pushd ../pulp-cli -pip install -r test_requirements.txt -pytest -v tests -m "pulp_container" +if [[ -f "test_requirements.txt" ]] +then + pip install -r test_requirements.txt + pytest -v tests -m "pulp_container" +else + PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest PYTEST_MARK="live and (pulp_container)" +fi popd if [ -f "$POST_SCRIPT" ]; then diff --git a/requirements.txt b/requirements.txt index a0916a596..67e111df3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ jsonschema>=4.4,<4.24 pulpcore>=3.49.0,<3.70 -pyjwt[crypto]>=2.4,<2.10 +pyjwt[crypto]>=2.4,<2.14 pycares<4.9 pysequoia>=0.1.33,<0.2.0