Skip to content

Commit c4ccd00

Browse files
pulpbotpulpbot
committed
Update CI files
[noissue]
1 parent 77898c0 commit c4ccd00

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

‎.ci/scripts/update_ci_branches.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222

2323
if not initial_branch or initial_branch not in branches:
24-
starting = -2
24+
exit("Initial branch not found")
2525
else:
2626
starting = branches.index(initial_branch)
2727

‎.github/template_gitref‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-127-gfedbecb
1+
2021.08.26-129-gf780fda

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
if: always()
199199
run: |
200200
echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
201-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
201+
http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true
202202
docker images || true
203203
docker ps -a || true
204204
docker logs pulp || true
@@ -326,7 +326,7 @@ jobs:
326326
if: always()
327327
run: |
328328
echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
329-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
329+
http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true
330330
docker images || true
331331
docker ps -a || true
332332
docker logs pulp || true

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
if: always()
160160
run: |
161161
echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
162-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
162+
http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true
163163
docker images || true
164164
docker ps -a || true
165165
docker logs pulp || true
@@ -356,7 +356,7 @@ jobs:
356356
if: always()
357357
run: |
358358
echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
359-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
359+
http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true
360360
docker images || true
361361
docker ps -a || true
362362
docker logs pulp || true

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ jobs:
233233
if: always()
234234
run: |
235235
echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
236-
http --timeout 30 --check-status --pretty format --print hb https://pulp/pulp/api/v3/status/ || true
236+
http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true
237237
docker images || true
238238
docker ps -a || true
239239
docker logs pulp || true

‎.github/workflows/scripts/install.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ set -euv
1515

1616
source .github/workflows/scripts/utils.sh
1717

18+
export PULP_API_ROOT="/pulp/"
19+
1820
if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]; then
1921
pip install -r ../pulpcore/doc_requirements.txt
2022
pip install -r doc_requirements.txt
@@ -93,7 +95,6 @@ if [ "$TEST" = "s3" ]; then
9395
sed -i -e '$a s3_test: true\
9496
minio_access_key: "'$MINIO_ACCESS_KEY'"\
9597
minio_secret_key: "'$MINIO_SECRET_KEY'"' vars/main.yaml
96-
echo "PULP_API_ROOT=/rerouted/djnd/" >> "$GITHUB_ENV"
9798
export PULP_API_ROOT="/rerouted/djnd/"
9899
fi
99100

@@ -113,6 +114,8 @@ if [ "$TEST" = "azure" ]; then
113114
sed -i -e '$a azure_test: true' vars/main.yaml
114115
fi
115116

117+
echo "PULP_API_ROOT=${PULP_API_ROOT}" >> "$GITHUB_ENV"
118+
116119
if [ "${PULP_API_ROOT:-}" ]; then
117120
sed -i -e '$a api_root: "'"$PULP_API_ROOT"'"' vars/main.yaml
118121
fi

‎.github/workflows/scripts/script.sh‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ if [[ "$TEST" = "docs" ]]; then
4545
fi
4646

4747
if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then
48-
STATUS_ENDPOINT="${PULP_URL}/pulp/api/v3/status/"
49-
if [ "${PULP_API_ROOT:-}" ]; then
50-
STATUS_ENDPOINT="${PULP_URL}${PULP_API_ROOT}api/v3/status/"
51-
fi
48+
STATUS_ENDPOINT="${PULP_URL}${PULP_API_ROOT}api/v3/status/"
5249
echo $STATUS_ENDPOINT
5350
REPORTED_VERSION=$(http $STATUS_ENDPOINT | jq --arg plugin python --arg legacy_plugin pulp_python -r '.versions[] | select(.component == $plugin or .component == $legacy_plugin) | .version')
5451
response=$(curl --write-out %{http_code} --silent --output /dev/null https://pypi.org/project/pulp-python/$REPORTED_VERSION/)

‎template_config.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# This config represents the latest values used when running the plugin-template. Any settings that
22
# were not present before running plugin-template have been added with their default values.
33

4-
# generated with [email protected]125-g1923e98
4+
# generated with [email protected]129-gf780fda
55

66
additional_plugins: []
77
additional_repos: []
88
aiohttp_fixtures_origin: 172.18.0.1
9+
api_root: /pulp/
910
black: false
1011
check_commit_message: true
1112
check_gettext: true

0 commit comments

Comments
 (0)