Skip to content

Commit

Permalink
Backport #604 to 3.22
Browse files Browse the repository at this point in the history
Get correct version of pulp-cli tests

(cherry picked from commit b0dd452)
  • Loading branch information
markafarrell authored and gerrod3 committed Mar 6, 2024
1 parent 77c7735 commit fc28c1e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGES/603.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ensure we are using the correct version of pulp-cli tests
19 changes: 16 additions & 3 deletions images/s6_assets/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,28 @@ start_container_and_wait $image
if [[ ${image} != *"galaxy"* ]];then
curl --insecure --fail $scheme://localhost:8080/assets/rest_framework/js/default.js
grep "127.0.0.1 pulp" /etc/hosts || echo "127.0.0.1 pulp" | sudo tee -a /etc/hosts

echo "Installing Pulp-CLI"
pip install pulp-cli

# Retreive installed pulp-cli version
PULP_CLI_VERSION=$(python3 -c \
'import importlib.metadata; \
from packaging.version import Version; \
print(Version(importlib.metadata.version("pulp-cli")))')

# Checkout git repo for pulp-cli at correct version to fetch tests
if [ -d pulp-cli ]; then
cd pulp-cli
git fetch origin
git reset --hard origin/main
git fetch --tags origin
git reset --hard $PULP_CLI_VERSION
else
git clone --depth=1 https://github.com/pulp/pulp-cli.git
git clone --depth=1 https://github.com/pulp/pulp-cli.git -b "${PULP_CLI_VERSION}"
cd pulp-cli
fi

pip install -r test_requirements.txt || pip install --no-build-isolation -r test_requirements.txt

if [ -e tests/cli.toml ]; then
mv tests/cli.toml "tests/cli.toml.bak.$(date -R)"
fi
Expand Down

0 comments on commit fc28c1e

Please sign in to comment.