Skip to content

Commit c4136d4

Browse files
committed
Update storage config test settings
1 parent 68e473a commit c4136d4

4 files changed

Lines changed: 34 additions & 5 deletions

File tree

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ jobs:
3535
towncrier build --yes --version 4.0.0.ci
3636
docs:
3737
if: "endsWith(github.base_ref, 'main')"
38-
uses: 'pulp/pulp-docs/.github/workflows/docs-ci.yml@rewrite-as-mkdocs-plugin'
38+
uses: 'pulp/pulp-docs/.github/workflows/docs-ci.yml@main'
3939
with:
40-
pulpdocs_ref: 'rewrite-as-mkdocs-plugin'
40+
pulpdocs_ref: 'main'
4141

4242
no-test:
4343
if: "!endsWith(github.base_ref, 'main')"

.github/workflows/scripts/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ if [ "$TEST" = "s3" ]; then
9393
sed -i -e '$a s3_test: true\
9494
minio_access_key: "'$MINIO_ACCESS_KEY'"\
9595
minio_secret_key: "'$MINIO_SECRET_KEY'"\
96-
pulp_scenario_settings: {"domain_enabled": true}\
96+
pulp_scenario_settings: {"MEDIA_ROOT": "", "STORAGES": {"default": {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage", "OPTIONS": {"access_key": "AKIAIT2Z5TDYPX3ARJBA", "addressing_style": "path", "bucket_name": "pulp3", "default_acl": "@none", "endpoint_url": "http://minio:9000", "region_name": "eu-central-1", "secret_key": "fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS", "signature_version": "s3v4"}}, "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}}, "domain_enabled": true}\
9797
pulp_scenario_env: {}\
9898
' vars/main.yaml
9999
export PULP_API_ROOT="/rerouted/djnd/"
@@ -107,7 +107,7 @@ if [ "$TEST" = "azure" ]; then
107107
- ./azurite:/etc/pulp\
108108
command: "azurite-blob --blobHost 0.0.0.0"' vars/main.yaml
109109
sed -i -e '$a azure_test: true\
110-
pulp_scenario_settings: {"domain_enabled": true}\
110+
pulp_scenario_settings: {"MEDIA_ROOT": "", "STORAGES": {"default": {"BACKEND": "storages.backends.azure_storage.AzureStorage", "OPTIONS": {"account_key": "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==", "account_name": "devstoreaccount1", "azure_container": "pulp-test", "connection_string": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;", "expiration_secs": 120, "location": "pulp3", "overwrite_files": true}}, "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}}, "domain_enabled": true}\
111111
pulp_scenario_env: {}\
112112
' vars/main.yaml
113113
fi

doc_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
#
66
# For more info visit https://github.com/pulp/plugin_template
77
towncrier
8-
pulp-docs @ git+https://github.com/pulp/pulp-docs@rewrite-as-mkdocs-plugin
8+
pulp-docs @ git+https://github.com/pulp/pulp-docs@main

template_config.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,39 @@ pulp_scheme: https
4444
pulp_settings:
4545
orphan_protection_time: 0
4646
pulp_settings_azure:
47+
MEDIA_ROOT: ''
48+
STORAGES:
49+
default:
50+
BACKEND: storages.backends.azure_storage.AzureStorage
51+
OPTIONS:
52+
account_key: Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==
53+
account_name: devstoreaccount1
54+
azure_container: pulp-test
55+
connection_string: DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;
56+
expiration_secs: 120
57+
location: pulp3
58+
overwrite_files: true
59+
staticfiles:
60+
BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
4761
domain_enabled: true
4862
pulp_settings_gcp:
4963
domain_enabled: true
5064
pulp_settings_s3:
65+
MEDIA_ROOT: ''
66+
STORAGES:
67+
default:
68+
BACKEND: storages.backends.s3boto3.S3Boto3Storage
69+
OPTIONS:
70+
access_key: AKIAIT2Z5TDYPX3ARJBA
71+
addressing_style: path
72+
bucket_name: pulp3
73+
default_acl: '@none'
74+
endpoint_url: http://minio:9000
75+
region_name: eu-central-1
76+
secret_key: fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS
77+
signature_version: s3v4
78+
staticfiles:
79+
BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage
5180
domain_enabled: true
5281
pydocstyle: false
5382
release_email: pulp-infra@redhat.com

0 commit comments

Comments
 (0)