From 66712c0425fbfeddbc6a3a8b43bc45380612c139 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 15 May 2022 03:28:20 +0000 Subject: [PATCH] Update CI files [noissue] --- .ci/scripts/update_ci_branches.py | 2 +- .github/template_gitref | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/scripts/install.sh | 5 ++++- .github/workflows/scripts/script.sh | 5 +---- template_config.yml | 3 ++- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.ci/scripts/update_ci_branches.py b/.ci/scripts/update_ci_branches.py index b921cb19a..1ecc0e18b 100755 --- a/.ci/scripts/update_ci_branches.py +++ b/.ci/scripts/update_ci_branches.py @@ -21,7 +21,7 @@ } if not initial_branch or initial_branch not in branches: - starting = -2 + exit("Initial branch not found") else: starting = branches.index(initial_branch) diff --git a/.github/template_gitref b/.github/template_gitref index 12a11f519..e77179c6c 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-127-gfedbecb +2021.08.26-129-gf780fda diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0b324a52..ab8ebaa91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,7 +202,7 @@ jobs: if: always() run: | echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" - http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true + http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true docker images || true docker ps -a || true docker logs pulp || true @@ -330,7 +330,7 @@ jobs: if: always() run: | echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" - http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true + http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true docker images || true docker ps -a || true docker logs pulp || true diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 324af6ccb..825429b81 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -159,7 +159,7 @@ jobs: if: always() run: | echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" - http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true + http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true docker images || true docker ps -a || true docker logs pulp || true @@ -356,7 +356,7 @@ jobs: if: always() run: | echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" - http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true + http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true docker images || true docker ps -a || true docker logs pulp || true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1c64d2e2..8c17d1ac6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -233,7 +233,7 @@ jobs: if: always() run: | echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" - http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true + http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true docker images || true docker ps -a || true docker logs pulp || true diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 4b5160ecb..69f4bef0e 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -15,6 +15,8 @@ set -euv source .github/workflows/scripts/utils.sh +export PULP_API_ROOT="/pulp/" + if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]; then pip install -r ../pulpcore/doc_requirements.txt pip install -r doc_requirements.txt @@ -103,7 +105,6 @@ if [ "$TEST" = "s3" ]; then sed -i -e '$a s3_test: true\ minio_access_key: "'$MINIO_ACCESS_KEY'"\ minio_secret_key: "'$MINIO_SECRET_KEY'"' vars/main.yaml - echo "PULP_API_ROOT=/rerouted/djnd/" >> "$GITHUB_ENV" export PULP_API_ROOT="/rerouted/djnd/" fi @@ -123,6 +124,8 @@ if [ "$TEST" = "azure" ]; then sed -i -e '$a azure_test: true' vars/main.yaml fi +echo "PULP_API_ROOT=${PULP_API_ROOT}" >> "$GITHUB_ENV" + if [ "${PULP_API_ROOT:-}" ]; then sed -i -e '$a api_root: "'"$PULP_API_ROOT"'"' vars/main.yaml fi diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 820de1efe..3c812ff9c 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -45,10 +45,7 @@ if [[ "$TEST" = "docs" ]]; then fi if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then - STATUS_ENDPOINT="${PULP_URL}/pulp/api/v3/status/" - if [ "${PULP_API_ROOT:-}" ]; then - STATUS_ENDPOINT="${PULP_URL}${PULP_API_ROOT}api/v3/status/" - fi + STATUS_ENDPOINT="${PULP_URL}${PULP_API_ROOT}api/v3/status/" echo $STATUS_ENDPOINT REPORTED_VERSION=$(http $STATUS_ENDPOINT | jq --arg plugin ansible --arg legacy_plugin pulp_ansible -r '.versions[] | select(.component == $plugin or .component == $legacy_plugin) | .version') response=$(curl --write-out %{http_code} --silent --output /dev/null https://pypi.org/project/pulp-ansible/$REPORTED_VERSION/) diff --git a/template_config.yml b/template_config.yml index f10bf7fbb..d68cd94c1 100644 --- a/template_config.yml +++ b/template_config.yml @@ -1,7 +1,7 @@ # This config represents the latest values used when running the plugin-template. Any settings that # were not present before running plugin-template have been added with their default values. -# generated with plugin_template@2021.08.26-125-g1923e98 +# generated with plugin_template@2021.08.26-129-gf780fda additional_repos: - bindings: false @@ -9,6 +9,7 @@ additional_repos: name: galaxy-importer org: ansible aiohttp_fixtures_origin: 172.18.0.1 +api_root: /pulp/ black: true check_commit_message: true check_gettext: true