Skip to content

Commit 4c84aa1

Browse files
committed
Update CI files
1 parent e7491ab commit 4c84aa1

16 files changed

Lines changed: 39 additions & 29 deletions

.ci/ansible/inventory.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ all:
55
hosts:
66
pulp:
77
pulp-fixtures:
8-
minio:
8+
rustfs:
99
ci-sftp:
1010
vars:
1111
ansible_connection: docker

.ci/ansible/start_container.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
from botocore.exceptions import ClientError
6565
client = boto3.client(
6666
"s3",
67-
aws_access_key_id="{{ minio_access_key }}",
68-
aws_secret_access_key="{{ minio_secret_key }}",
69-
endpoint_url="http://minio:9000",
67+
aws_access_key_id="{{ rustfs_access_key }}",
68+
aws_secret_access_key="{{ rustfs_secret_key }}",
69+
endpoint_url="http://rustfs:9000",
7070
region_name="eu-central-1",
7171
)
7272
try:

.ci/scripts/calc_constraints.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@
2626
def fetch_pulpcore_upper_bound(requirement):
2727
with urllib.request.urlopen(CORE_TEMPLATE_URL) as f:
2828
template = yaml.safe_load(f.read())
29-
supported_versions = template["supported_release_branches"]
30-
supported_versions.append(template["latest_release_branch"])
29+
supported_branches = [
30+
*template["supported_release_branches"],
31+
template["latest_release_branch"],
32+
]
3133
applicable_versions = sorted(
32-
requirement.specifier.filter((Version(v) for v in supported_versions))
34+
Version(branch)
35+
for branch in supported_branches
36+
if requirement.specifier.contains(Version(f"{branch}.999999"))
3337
)
3438
if len(applicable_versions) == 0:
3539
raise Exception("No supported pulpcore version in required range.")

.ci/scripts/pr_labels.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
#!/bin/env python3
2+
# /// script
3+
# requires-python = ">=3.12"
4+
# dependencies = [
5+
# "gitpython>=3.1.62",
6+
# ]
7+
# ///
28

39
# This script is running with elevated privileges from the main branch against pull requests.
410

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
path: "pulp-openapi-generator"
3434
- uses: "actions/setup-python@v6"
3535
with:
36-
python-version: "3.11"
36+
python-version: "3.9"
3737
- name: "Install uv"
3838
uses: "astral-sh/setup-uv@v7"
3939
with:

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
path: "pulp_python"
3131
- uses: "actions/setup-python@v6"
3232
with:
33-
python-version: "3.11"
33+
python-version: "3.9"
3434
- name: "Install uv"
3535
uses: "astral-sh/setup-uv@v7"
3636
with:
@@ -61,7 +61,7 @@ jobs:
6161

6262
- uses: "actions/setup-python@v6"
6363
with:
64-
python-version: "3.12"
64+
python-version: "3.9"
6565
- name: "Install uv"
6666
uses: "astral-sh/setup-uv@v7"
6767
with:

.github/workflows/create-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- uses: "actions/setup-python@v6"
4040
with:
41-
python-version: "3.11"
41+
python-version: "3.9"
4242
- name: "Install uv"
4343
uses: "astral-sh/setup-uv@v7"
4444
with:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- uses: "actions/setup-python@v6"
3131
with:
32-
python-version: "3.11"
32+
python-version: "3.9"
3333
- name: "Install uv"
3434
uses: "astral-sh/setup-uv@v7"
3535
with:

.github/workflows/pr_checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fetch-depth: 0
4141
- uses: "actions/setup-python@v6"
4242
with:
43-
python-version: "3.11"
43+
python-version: "3.14"
4444
- name: "Install uv"
4545
uses: "astral-sh/setup-uv@v7"
4646
with:
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
uv pip install GitPython==3.1.42
5151
git fetch origin ${{ github.event.pull_request.head.sha }}
52-
python .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
52+
uv run --script .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
5353
- uses: "actions/github-script@v8"
5454
name: "Apply PR Labels"
5555
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- uses: "actions/setup-python@v6"
3535
with:
36-
python-version: "3.11"
36+
python-version: "3.9"
3737
- name: "Install uv"
3838
uses: "astral-sh/setup-uv@v7"
3939
with:

0 commit comments

Comments
 (0)