Skip to content

Commit d9e7a10

Browse files
committed
Update CI files
1 parent 10ea9c6 commit d9e7a10

File tree

3 files changed

+0
-55
lines changed

3 files changed

+0
-55
lines changed

.ci/ansible/settings.py.j2

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -26,56 +26,3 @@ API_ROOT = {{ api_root | repr }}
2626
{% endfor %}
2727
{% endif %}
2828

29-
{% 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 %}
52-
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
53-
AWS_ACCESS_KEY_ID = "{{ minio_access_key }}"
54-
AWS_SECRET_ACCESS_KEY = "{{ minio_secret_key }}"
55-
AWS_S3_REGION_NAME = "eu-central-1"
56-
AWS_S3_ADDRESSING_STYLE = "path"
57-
AWS_S3_SIGNATURE_VERSION = "s3v4"
58-
AWS_STORAGE_BUCKET_NAME = "pulp3"
59-
AWS_S3_ENDPOINT_URL = "http://minio:9000"
60-
AWS_DEFAULT_ACL = "@none None"
61-
{% endif %}
62-
{% endif %}
63-
64-
{% if azure_test | default(false) %}
65-
DEFAULT_FILE_STORAGE = "storages.backends.azure_storage.AzureStorage"
66-
MEDIA_ROOT = ""
67-
AZURE_ACCOUNT_KEY = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
68-
AZURE_ACCOUNT_NAME = "devstoreaccount1"
69-
AZURE_CONTAINER = "pulp-test"
70-
AZURE_LOCATION = "pulp3"
71-
AZURE_OVERWRITE_FILES = True
72-
AZURE_URL_EXPIRATION_SECS = 120
73-
AZURE_CONNECTION_STRING = 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;'
74-
{% endif %}
75-
76-
{% if gcp_test | default(false) %}
77-
DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
78-
MEDIA_ROOT = ""
79-
GS_BUCKET_NAME = "gcppulp"
80-
GS_CUSTOM_ENDPOINT = "http://ci-gcp:4443"
81-
{% endif %}

.github/workflows/scripts/install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ minio_access_key: "'$MINIO_ACCESS_KEY'"\
9595
minio_secret_key: "'$MINIO_SECRET_KEY'"\
9696
pulp_scenario_settings: {"domain_enabled": true, "hide_guarded_distributions": true}\
9797
pulp_scenario_env: {}\
98-
test_storages_compat_layer: false\
9998
' vars/main.yaml
10099
export PULP_API_ROOT="/rerouted/djnd/"
101100
fi

template_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,5 @@ test_lowerbounds: true
6868
test_performance: false
6969
test_reroute: true
7070
test_s3: true
71-
test_storages_compat_layer: false
7271
use_issue_template: true
7372

0 commit comments

Comments
 (0)