diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2 index 4ed28f42a..7a73ea2f3 100644 --- a/.ci/ansible/settings.py.j2 +++ b/.ci/ansible/settings.py.j2 @@ -27,18 +27,39 @@ API_ROOT = {{ api_root | repr }} {% endif %} {% if s3_test | default(false) %} +MEDIA_ROOT: "" +S3_USE_SIGV4 = True +{% if test_storages_compat_layer is defined and test_storages_compat_layer %} +STORAGES = { + "default": { + "BACKEND": "storages.backends.s3boto3.S3Boto3Storage", + "OPTIONS": { + "access_key": "{{ minio_access_key }}", + "secret_key": "{{ minio_secret_key }}", + "region_name": "eu-central-1", + "addressing_style": "path", + "signature_version": "s3v4", + "bucket_name": "pulp3", + "endpoint_url": "http://minio:9000", + "default_acl": "@none None", + }, + }, + "staticfiles": { + "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage", + }, +} +{% else %} DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" -MEDIA_ROOT = "" AWS_ACCESS_KEY_ID = "{{ minio_access_key }}" AWS_SECRET_ACCESS_KEY = "{{ minio_secret_key }}" AWS_S3_REGION_NAME = "eu-central-1" AWS_S3_ADDRESSING_STYLE = "path" -S3_USE_SIGV4 = True AWS_S3_SIGNATURE_VERSION = "s3v4" AWS_STORAGE_BUCKET_NAME = "pulp3" AWS_S3_ENDPOINT_URL = "http://minio:9000" AWS_DEFAULT_ACL = "@none None" {% endif %} +{% endif %} {% if azure_test | default(false) %} DEFAULT_FILE_STORAGE = "storages.backends.azure_storage.AzureStorage" diff --git a/.ci/scripts/validate_commit_message.py b/.ci/scripts/validate_commit_message.py index 13a0086f3..bce524ba7 100755 --- a/.ci/scripts/validate_commit_message.py +++ b/.ci/scripts/validate_commit_message.py @@ -24,7 +24,8 @@ r"^DO\s*NOT\s*MERGE", r"^EXPERIMENT", r"^FIXUP", - r"Apply suggestions from code review", + r"^fixup!", # This is created by 'git commit --fixup' + r"Apply suggestions from code review", # This usually comes from GitHub ] try: CHANGELOG_EXTS = [ @@ -40,7 +41,11 @@ if NOISSUE_MARKER in message: sys.exit(f"Do not add '{NOISSUE_MARKER}' in the commit message.") -if any((re.match(pattern, message, re.IGNORECASE) for pattern in BLOCKING_REGEX)): +blocking_matches = [m for m in (re.match(pattern, message) for pattern in BLOCKING_REGEX) if m] +if blocking_matches: + print("Found these phrases in the commit message:") + for m in blocking_matches: + print(" - " + m.group(0)) sys.exit("This PR is not ready for consumption.") g = Github(os.environ.get("GITHUB_TOKEN")) diff --git a/.github/template_gitref b/.github/template_gitref index 51006453f..4630e6c46 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-417-gcec8e48 +2021.08.26-421-g204a709 diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 338353741..dd68bd5ed 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -97,6 +97,7 @@ minio_access_key: "'$MINIO_ACCESS_KEY'"\ minio_secret_key: "'$MINIO_SECRET_KEY'"\ pulp_scenario_settings: null\ pulp_scenario_env: {}\ +test_storages_compat_layer: false\ ' vars/main.yaml export PULP_API_ROOT="/rerouted/djnd/" fi diff --git a/template_config.yml b/template_config.yml index 6b32dda0e..528392a05 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-387-ge627e91 +# generated with plugin_template@2021.08.26-421-g204a709 api_root: /pulp/ black: true @@ -73,5 +73,6 @@ test_lowerbounds: true test_performance: false test_reroute: true test_s3: true +test_storages_compat_layer: false use_issue_template: true