From 012dd80b461d6243360aaef9cd2539fd8f6b2c97 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 3 May 2026 11:46:25 +0000 Subject: [PATCH] Update CI files --- .github/workflows/scripts/before_script.sh | 4 ++++ .github/workflows/scripts/script.sh | 9 +++++++-- .github/workflows/test.yml | 5 +++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scripts/before_script.sh b/.github/workflows/scripts/before_script.sh index 5802a861a..1b8c2cf25 100755 --- a/.github/workflows/scripts/before_script.sh +++ b/.github/workflows/scripts/before_script.sh @@ -25,6 +25,10 @@ echo echo "# Pulp config:" tail -v -n +1 .ci/ansible/settings/settings.* +echo +echo "# Pulp CLI config" +tail -v -n +1 "../pulp-cli-deb/tests/cli.toml" + echo echo "# Containerfile:" tail -v -n +1 .ci/ansible/Containerfile diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index d3bdf9e77..14fb166c4 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -146,8 +146,13 @@ export PULP_FIXTURES_URL="http://pulp-fixtures:8080" # 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-deb -pip install -r test_requirements.txt -pytest -v tests -m "pulp_deb" +if [[ -f "test_requirements.txt" ]] +then + pip install -r test_requirements.txt + pytest -v tests -m "pulp_deb" +else + PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest +fi popd if [ -f "$POST_SCRIPT" ]; then diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de65b4df9..9ba9ca8f4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,6 +42,11 @@ jobs: with: python-version: "3.11" + - name: "Install uv" + uses: "astral-sh/setup-uv@v7" + with: + enable-cache: true + - name: "Download plugin package" uses: "actions/download-artifact@v8" with: