From b6ef7b02489d406aa1551aca37f8c631cce94bdc Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 3 Aug 2025 03:14:06 +0000 Subject: [PATCH] Update CI files --- .ci/ansible/Containerfile.j2 | 6 +++--- template_config.yml | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2 index d57b44ed..01469b64 100644 --- a/.ci/ansible/Containerfile.j2 +++ b/.ci/ansible/Containerfile.j2 @@ -5,9 +5,9 @@ FROM {{ ci_base | default(pulp_default_container) }} ADD ./{{ item.name }} ./{{ item.name }} {% endfor %} -# Install python packages -# S3 botocore needs to be patched to handle responses from minio during 0-byte uploads -# Hacking botocore (https://github.com/boto/botocore/pull/1990) +{% for item in extra_files | default([]) %} +ADD ./{{ item.origin }} {{ item.destination }} +{% endfor %} # This MUST be the ONLY call to pip install in inside the container. RUN pip3 install --upgrade pip setuptools wheel && \ diff --git a/template_config.yml b/template_config.yml index fc51c714..23838d0a 100644 --- a/template_config.yml +++ b/template_config.yml @@ -1,7 +1,7 @@ # This config represents the latest values used when running the plugin-template. Any settings that # were not present before running plugin-template have been added with their default values. -# generated with plugin_template@2021.08.26-420-gf332a34 +# generated with plugin_template api_root: /pulp/ black: false @@ -20,6 +20,7 @@ deploy_client_to_rubygems: true deploy_to_pypi: true disabled_redis_runners: [] docker_fixtures: false +extra_files: [] flake8: true flake8_ignore: [] github_org: pulp @@ -46,8 +47,8 @@ pulp_settings: orphan_protection_time: 0 pypi_api_hostname: https://pulp:443 pulp_settings_azure: - domain_enabled: true content_origin: null + domain_enabled: true pulp_settings_gcp: null pulp_settings_s3: domain_enabled: true