Skip to content

Commit c380827

Browse files
committed
Update CI files
1 parent 4496de1 commit c380827

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

.ci/ansible/settings.py.j2

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,39 @@ API_ROOT = {{ api_root | repr }}
2727
{% endif %}
2828

2929
{% if s3_test | default(false) %}
30+
MEDIA_ROOT: ""
31+
S3_USE_SIGV4 = True
32+
{% if test_storages_compat_layer is defined and test_storages_compat_layer %}
33+
STORAGES = {
34+
"default": {
35+
"BACKEND": "storages.backends.s3boto3.S3Boto3Storage",
36+
"OPTIONS": {
37+
"access_key": "{{ minio_access_key }}",
38+
"secret_key": "{{ minio_secret_key }}",
39+
"region_name": "eu-central-1",
40+
"addressing_style": "path",
41+
"signature_version": "s3v4",
42+
"bucket_name": "pulp3",
43+
"endpoint_url": "http://minio:9000",
44+
"default_acl": "@none None",
45+
},
46+
},
47+
"staticfiles": {
48+
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
49+
},
50+
}
51+
{% else %}
3052
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
31-
MEDIA_ROOT = ""
3253
AWS_ACCESS_KEY_ID = "{{ minio_access_key }}"
3354
AWS_SECRET_ACCESS_KEY = "{{ minio_secret_key }}"
3455
AWS_S3_REGION_NAME = "eu-central-1"
3556
AWS_S3_ADDRESSING_STYLE = "path"
36-
S3_USE_SIGV4 = True
3757
AWS_S3_SIGNATURE_VERSION = "s3v4"
3858
AWS_STORAGE_BUCKET_NAME = "pulp3"
3959
AWS_S3_ENDPOINT_URL = "http://minio:9000"
4060
AWS_DEFAULT_ACL = "@none None"
4161
{% endif %}
62+
{% endif %}
4263

4364
{% if azure_test | default(false) %}
4465
DEFAULT_FILE_STORAGE = "storages.backends.azure_storage.AzureStorage"

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-417-gcec8e48
1+
2021.08.26-420-gf332a34

.github/workflows/scripts/install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ minio_access_key: "'$MINIO_ACCESS_KEY'"\
9595
minio_secret_key: "'$MINIO_SECRET_KEY'"\
9696
pulp_scenario_settings: null\
9797
pulp_scenario_env: {}\
98+
test_storages_compat_layer: false\
9899
' vars/main.yaml
99100
export PULP_API_ROOT="/rerouted/djnd/"
100101
fi

template_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This config represents the latest values used when running the plugin-template. Any settings that
22
# were not present before running plugin-template have been added with their default values.
33

4-
# generated with [email protected]383-gc4cd2b8
4+
# generated with [email protected]420-gf332a34
55

66
api_root: /pulp/
77
black: true
@@ -62,5 +62,6 @@ test_lowerbounds: true
6262
test_performance: false
6363
test_reroute: true
6464
test_s3: true
65+
test_storages_compat_layer: false
6566
use_issue_template: true
6667

0 commit comments

Comments
 (0)