Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/scripts/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ filename = "./pyproject.toml"
search = "version = \"{current_version}\""
replace = "version = \"{new_version}\""


[tool.towncrier]
package = "pulp_gem"
filename = "CHANGES.md"
Expand Down
Loading