Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/ansible/inventory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ all:
hosts:
pulp:
pulp-fixtures:
minio:
rustfs:
ci-sftp:
vars:
ansible_connection: docker
Expand Down
6 changes: 3 additions & 3 deletions .ci/ansible/start_container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
from botocore.exceptions import ClientError
client = boto3.client(
"s3",
aws_access_key_id="{{ minio_access_key }}",
aws_secret_access_key="{{ minio_secret_key }}",
endpoint_url="http://minio:9000",
aws_access_key_id="{{ rustfs_access_key }}",
aws_secret_access_key="{{ rustfs_secret_key }}",
endpoint_url="http://rustfs:9000",
region_name="eu-central-1",
)
try:
Expand Down
6 changes: 6 additions & 0 deletions .ci/scripts/pr_labels.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#!/bin/env python3
# /// script
# requires-python = ">=3.12"
# dependencies = [
# "gitpython>=3.1.62",
# ]
# ///

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
fetch-depth: 0
- uses: "actions/setup-python@v6"
with:
python-version: "3.11"
python-version: "3.14"
- name: "Install uv"
uses: "astral-sh/setup-uv@v7"
with:
Expand All @@ -49,7 +49,7 @@ jobs:
run: |
uv pip install GitPython==3.1.42
git fetch origin ${{ github.event.pull_request.head.sha }}
python .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
uv run --script .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
- uses: "actions/github-script@v8"
name: "Apply PR Labels"
with:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/scripts/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@ services:
VARSYAML

if [ "$TEST" = "s3" ]; then
MINIO_ACCESS_KEY=AKIAIT2Z5TDYPX3ARJBA
MINIO_SECRET_KEY=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
RUSTFS_ACCESS_KEY=AKIAIT2Z5TDYPX3ARJBA
RUSTFS_SECRET_KEY=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
cat >> .ci/ansible/vars/main.yaml << VARSYAML
- name: "minio"
image: "minio/minio"
- name: "rustfs"
image: "rustfs/rustfs"
env:
MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY}"
MINIO_SECRET_KEY: "${MINIO_SECRET_KEY}"
RUSTFS_ACCESS_KEY: "${RUSTFS_ACCESS_KEY}"
RUSTFS_SECRET_KEY: "${RUSTFS_SECRET_KEY}"
command: "server /data"
s3_test: true
minio_access_key: "${MINIO_ACCESS_KEY}"
minio_secret_key: "${MINIO_SECRET_KEY}"
rustfs_access_key: "${RUSTFS_ACCESS_KEY}"
rustfs_secret_key: "${RUSTFS_SECRET_KEY}"
pulp_scenario_settings: {"api_root": "/rerouted/djnd/"}
# MinIO omits 100-continue on 0-byte PUTs; stock botocore hangs without this (boto/botocore#3123).
pulp_scenario_env: {"BOTO_EXPERIMENTAL__NO_EMPTY_CONTINUE": "true"}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
with:
fetch-depth: 0
path: "pulp_smart_proxy"
ref: "0.5"
ref: "0.6"

- name: "Run update"
working-directory: "pulp_smart_proxy"
Expand All @@ -92,21 +92,21 @@ jobs:

- name: "Create Pull Request for CI files"
uses: "peter-evans/create-pull-request@v8"
id: "create_pr_0_5"
id: "create_pr_0_6"
with:
token: "${{ secrets.RELEASE_TOKEN }}"
path: "pulp_smart_proxy"
committer: "theforeman-bot <python@community.theforeman.org>"
author: "theforeman-bot <python@community.theforeman.org>"
title: "Update CI files for branch 0.5"
branch: "update-ci/0.5"
base: "0.5"
title: "Update CI files for branch 0.6"
branch: "update-ci/0.6"
base: "0.6"
delete-branch: true
- name: "Mark PR automerge"
working-directory: "pulp_smart_proxy"
run: |
gh pr merge --rebase --auto "${{ steps.create_pr_0_5.outputs.pull-request-number }}"
if: "steps.create_pr_0_5.outputs.pull-request-number"
gh pr merge --rebase --auto "${{ steps.create_pr_0_6.outputs.pull-request-number }}"
if: "steps.create_pr_0_6.outputs.pull-request-number"
env:
GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
continue-on-error: true
Expand Down
1 change: 0 additions & 1 deletion CHANGES/+support_pulpcore_3.129.feature

This file was deleted.

2 changes: 1 addition & 1 deletion pulp_smart_proxy/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class PulpSmartProxyPluginAppConfig(PulpPluginAppConfig):

name = "pulp_smart_proxy.app"
label = "smart_proxy"
version = "0.6.0.dev"
version = "0.7.0.dev"
python_package_name = "pulp_smart_proxy"
domain_compatible = True
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = "pulp-smart-proxy"
version = "0.6.0.dev"
version = "0.7.0.dev"
description = "pulp-smart-proxy plugin for the Pulp Project"
readme = "README.md"
authors = [
Expand Down Expand Up @@ -120,7 +120,7 @@ ignore = [
[tool.bumpversion]
# This section is managed by the plugin template. Do not edit manually.

current_version = "0.6.0.dev"
current_version = "0.7.0.dev"
commit = false
tag = false
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
Expand Down
2 changes: 1 addition & 1 deletion template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ disabled_redis_runners: []
docker_fixtures: false
extra_files: []
github_org: "theforeman"
latest_release_branch: "0.5"
latest_release_branch: "0.6"
lint_ignore: []
lint_requirements: true
os_required_packages: []
Expand Down
Loading