From 9a8256f9aa2bfd6f297fbde9d3f9d49cc50f964e Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 19 Jan 2025 03:36:32 +0000
Subject: [PATCH] Update CI files

---
 .ci/ansible/settings.py.j2           | 25 +++++++++++++++++++++++--
 .github/template_gitref              |  2 +-
 .github/workflows/scripts/install.sh |  1 +
 template_config.yml                  |  3 ++-
 4 files changed, 27 insertions(+), 4 deletions(-)

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/.github/template_gitref b/.github/template_gitref
index 51006453f..bdfe03f31 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-417-gcec8e48
+2021.08.26-420-gf332a34
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index 2e4e664a4..c80bf6471 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 2ac7c27aa..b7a0e1abc 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-383-gc4cd2b8
+# generated with plugin_template@2021.08.26-420-gf332a34
 
 api_root: /pulp/
 black: true
@@ -74,5 +74,6 @@ test_lowerbounds: true
 test_performance: false
 test_reroute: true
 test_s3: true
+test_storages_compat_layer: false
 use_issue_template: true