Skip to content

Commit e9e61fb

Browse files
committed
Update CI files
1 parent 953b9f5 commit e9e61fb

6 files changed

Lines changed: 22 additions & 16 deletions

File tree

.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/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/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/scripts/before_install.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,19 @@ services:
7676
VARSYAML
7777

7878
if [ "$TEST" = "s3" ]; then
79-
MINIO_ACCESS_KEY=AKIAIT2Z5TDYPX3ARJBA
80-
MINIO_SECRET_KEY=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
79+
RUSTFS_ACCESS_KEY=AKIAIT2Z5TDYPX3ARJBA
80+
RUSTFS_SECRET_KEY=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
8181
cat >> .ci/ansible/vars/main.yaml << VARSYAML
82-
- name: "minio"
83-
image: "minio/minio"
82+
- name: "rustfs"
83+
image: "rustfs/rustfs"
8484
env:
85-
MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY}"
86-
MINIO_SECRET_KEY: "${MINIO_SECRET_KEY}"
85+
RUSTFS_ACCESS_KEY: "${RUSTFS_ACCESS_KEY}"
86+
RUSTFS_SECRET_KEY: "${RUSTFS_SECRET_KEY}"
8787
command: "server /data"
8888
s3_test: true
89-
minio_access_key: "${MINIO_ACCESS_KEY}"
90-
minio_secret_key: "${MINIO_SECRET_KEY}"
91-
pulp_scenario_settings: {"MEDIA_ROOT": "", "STORAGES": {"default": {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage", "OPTIONS": {"access_key": "AKIAIT2Z5TDYPX3ARJBA", "addressing_style": "path", "bucket_name": "pulp3", "default_acl": "@none", "endpoint_url": "http://minio:9000", "region_name": "eu-central-1", "secret_key": "fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS", "signature_version": "s3v4"}}, "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}}, "api_root": "/rerouted/djnd/", "domain_enabled": true}
89+
rustfs_access_key: "${RUSTFS_ACCESS_KEY}"
90+
rustfs_secret_key: "${RUSTFS_SECRET_KEY}"
91+
pulp_scenario_settings: {"MEDIA_ROOT": "", "STORAGES": {"default": {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage", "OPTIONS": {"access_key": "AKIAIT2Z5TDYPX3ARJBA", "addressing_style": "path", "bucket_name": "pulp3", "default_acl": "@none", "endpoint_url": "https://rustfs:9000", "region_name": "eu-central-1", "secret_key": "fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS", "signature_version": "s3v4"}}, "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}}, "api_root": "/rerouted/djnd/", "domain_enabled": true}
9292
# MinIO omits 100-continue on 0-byte PUTs; stock botocore hangs without this (boto/botocore#3123).
9393
pulp_scenario_env: {"BOTO_EXPERIMENTAL__NO_EMPTY_CONTINUE": "true"}
9494
VARSYAML

template_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pulp_settings_s3:
7272
addressing_style: "path"
7373
bucket_name: "pulp3"
7474
default_acl: "@none"
75-
endpoint_url: "http://minio:9000"
75+
endpoint_url: "https://rustfs:9000"
7676
region_name: "eu-central-1"
7777
secret_key: "fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS"
7878
signature_version: "s3v4"

0 commit comments

Comments
 (0)