Skip to content

Commit 2013cfb

Browse files
committed
Update CI files
1 parent c67e50f commit 2013cfb

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

.ci/scripts/calc_constraints.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,15 @@ def to_lower_bound(req):
8383
else:
8484
for spec in requirement.specifier:
8585
if spec.operator == ">=":
86+
min_version = spec.version
8687
if requirement.name == "pulpcore":
8788
# Currently an exception to allow for pulpcore bugfix releases.
8889
# TODO Semver libraries should be allowed too.
8990
operator = "~="
91+
if len(Version(min_version).release) != 3:
92+
raise RuntimeError("Pulpcore lower bound must be in the form '>=x.y.z'.")
9093
else:
9194
operator = "=="
92-
min_version = spec.version
9395
return f"{requirement.name}{operator}{min_version}"
9496
return f"# NO LOWER BOUND: {req}"
9597

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-421-g204a709
1+
2021.08.26-430-gc1faf10

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
test:
1515
if: "endsWith(github.base_ref, 'main')"
16-
runs-on: "ubuntu-20.04"
16+
runs-on: "ubuntu-latest"
1717
defaults:
1818
run:
1919
working-directory: "pulp_python"
@@ -48,7 +48,7 @@ jobs:
4848
4949
no-test:
5050
if: "!endsWith(github.base_ref, 'main')"
51-
runs-on: "ubuntu-20.04"
51+
runs-on: "ubuntu-latest"
5252
steps:
5353
- run: |
5454
echo "Skip docs testing on non-main branches."

.github/workflows/scripts/before_script.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ tail -v -n +1 .ci/ansible/settings/settings.* ~/.config/pulp_smash/settings.json
3232
echo "Containerfile:"
3333
tail -v -n +1 .ci/ansible/Containerfile
3434

35+
echo "Constraints Files:"
36+
# The need not even exist.
37+
tail -v -n +1 ../*/*constraints.txt || true
38+
3539
# Needed for some functional tests
3640
cmd_prefix bash -c "echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/nopasswd"
3741
cmd_prefix bash -c "usermod -a -G wheel pulp"

.github/workflows/scripts/script.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ export PULP_URL="https://pulp"
2828

2929
REPORTED_STATUS="$(pulp status)"
3030

31+
echo "${REPORTED_STATUS}"
32+
3133
echo "machine pulp
3234
login admin
3335
password password

0 commit comments

Comments
 (0)