From 3d2c1b20f1dc81cc79858f37c6849c2fbd683591 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 17 Feb 2026 20:48:43 +0000 Subject: [PATCH] Update CI files --- .ci/assets/ci_constraints.txt | 3 +- .ci/scripts/check_release.py | 11 ++++- template_config.yml | 76 ++++++++++++++++++----------------- 3 files changed, 51 insertions(+), 39 deletions(-) diff --git a/.ci/assets/ci_constraints.txt b/.ci/assets/ci_constraints.txt index c8070aff..c9198f19 100644 --- a/.ci/assets/ci_constraints.txt +++ b/.ci/assets/ci_constraints.txt @@ -1,5 +1,6 @@ # Pulpcore versions without the openapi command do no longer work in the CI -pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*,!=3.31.*,!=3.32.*,!=3.33.*,!=3.34.*,!=3.35.*,!=3.36.*,!=3.37.*,!=3.38.*,!=3.40.*,!=3.41.*,!=3.42.*,!=3.43.*,!=3.44.*,!=3.45.*,!=3.46.*,!=3.47.*,!=3.48.*,!=3.50.*,!=3.51.*,!=3.52.*,!=3.53.*,!=3.54.* +# Pulpcore versions without the django 5 storage compatibility will fail, >3.63,<3.70 +pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*,!=3.31.*,!=3.32.*,!=3.33.*,!=3.34.*,!=3.35.*,!=3.36.*,!=3.37.*,!=3.38.*,!=3.40.*,!=3.41.*,!=3.42.*,!=3.43.*,!=3.44.*,!=3.45.*,!=3.46.*,!=3.47.*,!=3.48.*,!=3.50.*,!=3.51.*,!=3.52.*,!=3.53.*,!=3.54.*,!=3.64.*,!=3.65.*,!=3.66.*,!=3.67.*,!=3.68.*,!=3.69.* tablib!=3.6.0 diff --git a/.ci/scripts/check_release.py b/.ci/scripts/check_release.py index 81bae1fd..86e250e4 100755 --- a/.ci/scripts/check_release.py +++ b/.ci/scripts/check_release.py @@ -1,11 +1,20 @@ #!/usr/bin/env python +# /// script +# requires-python = ">=3.13" +# dependencies = [ +# "gitpython>=3.1.46,<3.2.0", +# "packaging>=26.0,<26.1", +# "pyyaml>=6.0.3,<6.1.0", +# ] +# /// import argparse import re import os import tomllib -import yaml from pathlib import Path + +import yaml from packaging.version import Version from git import Repo diff --git a/template_config.yml b/template_config.yml index 6bd86c0d..b406ad77 100644 --- a/template_config.yml +++ b/template_config.yml @@ -2,18 +2,21 @@ # were not present before running plugin-template have been added with their default values. # generated with plugin_template +# +# After editing this file please always reapply the plugin template before committing any changes. -api_root: /pulp/ +--- +api_root: "/pulp/" black: false check_commit_message: true check_gettext: true check_manifest: true check_stray_pulpcore_imports: true -ci_base_image: ghcr.io/pulp/pulp-ci-centos9 +ci_base_image: "ghcr.io/pulp/pulp-ci-centos9" ci_env: {} -ci_trigger: '{pull_request: {branches: [''*'']}}' -cli_package: pulp-cli -cli_repo: https://github.com/pulp/pulp-cli.git +ci_trigger: "{pull_request: {branches: ['*']}}" +cli_package: "pulp-cli" +cli_repo: "https://github.com/pulp/pulp-cli.git" core_import_allowed: [] deploy_client_to_pypi: true deploy_client_to_rubygems: true @@ -23,62 +26,60 @@ docker_fixtures: false extra_files: [] flake8: true flake8_ignore: [] -github_org: pulp +github_org: "pulp" latest_release_branch: null lint_requirements: true os_required_packages: [] parallel_test_workers: 8 -plugin_app_label: python -plugin_default_branch: main -plugin_name: pulp_python +plugin_app_label: "python" +plugin_default_branch: "main" +plugin_name: "pulp_python" plugins: -- app_label: python - name: pulp_python -post_job_template: null -pre_job_template: null + - app_label: "python" + name: "pulp_python" pulp_env: {} pulp_env_azure: {} pulp_env_gcp: {} pulp_env_s3: {} -pulp_scheme: https +pulp_scheme: "https" pulp_settings: - allowed_export_paths: /tmp - allowed_import_paths: /tmp + allowed_export_paths: "/tmp" + allowed_import_paths: "/tmp" orphan_protection_time: 0 - pypi_api_hostname: https://pulp:443 + pypi_api_hostname: "https://pulp:443" pulp_settings_azure: - AZURE_ACCOUNT_KEY: Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw== - AZURE_ACCOUNT_NAME: devstoreaccount1 - AZURE_CONNECTION_STRING: DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1; - AZURE_CONTAINER: pulp-test - AZURE_LOCATION: pulp3 + AZURE_ACCOUNT_KEY: "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==" + AZURE_ACCOUNT_NAME: "devstoreaccount1" + AZURE_CONNECTION_STRING: "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;" + AZURE_CONTAINER: "pulp-test" + AZURE_LOCATION: "pulp3" AZURE_OVERWRITE_FILES: true AZURE_URL_EXPIRATION_SECS: 120 - DEFAULT_FILE_STORAGE: storages.backends.azure_storage.AzureStorage - MEDIA_ROOT: '' + DEFAULT_FILE_STORAGE: "storages.backends.azure_storage.AzureStorage" + MEDIA_ROOT: "" domain_enabled: true pulp_settings_gcp: null pulp_settings_s3: - AWS_ACCESS_KEY_ID: AKIAIT2Z5TDYPX3ARJBA - AWS_DEFAULT_ACL: '@none None' - AWS_S3_ADDRESSING_STYLE: path - AWS_S3_ENDPOINT_URL: http://minio:9000 - AWS_S3_REGION_NAME: eu-central-1 - AWS_S3_SIGNATURE_VERSION: s3v4 - AWS_SECRET_ACCESS_KEY: fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS - AWS_STORAGE_BUCKET_NAME: pulp3 - DEFAULT_FILE_STORAGE: storages.backends.s3boto3.S3Boto3Storage - MEDIA_ROOT: '' + AWS_ACCESS_KEY_ID: "AKIAIT2Z5TDYPX3ARJBA" + AWS_DEFAULT_ACL: "@none None" + AWS_S3_ADDRESSING_STYLE: "path" + AWS_S3_ENDPOINT_URL: "http://minio:9000" + AWS_S3_REGION_NAME: "eu-central-1" + AWS_S3_SIGNATURE_VERSION: "s3v4" + AWS_SECRET_ACCESS_KEY: "fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS" + AWS_STORAGE_BUCKET_NAME: "pulp3" + DEFAULT_FILE_STORAGE: "storages.backends.s3boto3.S3Boto3Storage" + MEDIA_ROOT: "" domain_enabled: true pydocstyle: true -release_email: pulp-infra@redhat.com -release_user: pulpbot +release_email: "pulp-infra@redhat.com" +release_user: "pulpbot" stalebot: true stalebot_days_until_close: 30 stalebot_days_until_stale: 90 stalebot_limit_to_pulls: true supported_release_branches: -- '3.11' + - "3.11" sync_ci: true test_azure: true test_cli: true @@ -89,4 +90,5 @@ test_performance: false test_reroute: true test_s3: true use_issue_template: true +...