diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index b926449..48de2dc 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -32,9 +32,8 @@ then fi fi -# Check out the pulp-cli-gem branch matching the installed version. -PULP_CLI_VERSION="$(uv pip freeze | sed -n -e 's/pulp-cli-gem==//p')" -git clone --depth 1 --branch "$PULP_CLI_VERSION" https://github.com/pulp/pulp-cli-gem.git ../pulp-cli-gem +# Temporarily use PR branch for debugging +git clone --depth 1 --branch "fix_tests" https://github.com/jobselko/pulp-cli-gem.git ../pulp-cli-gem PULP_API_ROOT="$(yq -r '.pulp_scenario_settings.api_root // .pulp_settings.api_root // "/pulp/"' < .ci/ansible/vars/main.yaml)" diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index cd36a2a..8f2d488 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -145,13 +145,7 @@ 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-gem -if [[ -f "test_requirements.txt" ]] -then - uv pip install -r test_requirements.txt - pytest -v tests -m "pulp_gem" -else - PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest PYTEST_MARK="live and (pulp_gem)" -fi +PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make paralleltest PYTEST_MARK="live and (pulp_gem)" popd if [ -f "$POST_SCRIPT" ]; then diff --git a/pyproject.toml b/pyproject.toml index f0ab23c..32cd062 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,7 +93,6 @@ filename = "./pyproject.toml" search = "version = \"{current_version}\"" replace = "version = \"{new_version}\"" - [tool.towncrier] package = "pulp_gem" filename = "CHANGES.md"