Skip to content

Commit a2365be

Browse files
committed
experiment: enable domains on pulp default scenario
1 parent 1d46c31 commit a2365be

3 files changed

Lines changed: 3 additions & 12 deletions

File tree

.github/workflows/scripts/before_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ legacy_component_name: "pulpcore"
5050
component_name: "core"
5151
component_version: "${COMPONENT_VERSION}"
5252
pulp_env: {"PULP_CA_BUNDLE": "/etc/pulp/certs/pulp_webserver.crt"}
53-
pulp_settings: {"allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"], "api_root": "/pulp/", "content_path_prefix": "/somewhere/else/", "csrf_trusted_origins": ["https://pulp:443"], "distributed_publication_retention_period": 3, "orphan_protection_time": 0, "task_diagnostics": ["memory"], "task_protection_time": 10, "tmpfile_protection_time": 10, "upload_protection_time": 10}
53+
pulp_settings: {"allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"], "api_root": "/pulp/", "content_path_prefix": "/somewhere/else/", "csrf_trusted_origins": ["https://pulp:443"], "distributed_publication_retention_period": 3, "domain_enabled": true, "orphan_protection_time": 0, "task_diagnostics": ["memory"], "task_protection_time": 10, "tmpfile_protection_time": 10, "upload_protection_time": 10}
5454
pulp_scheme: "https"
5555
image:
5656
name: "pulp"

.github/workflows/scripts/script.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,7 @@ touch bindings_requirements.txt
4646
pushd ../pulp-openapi-generator
4747
# Use app_label to generate api.json and package to produce the proper package name.
4848

49-
# Workaround: Domains are not supported by the published bindings.
50-
# Sadly: Different pulpcore-versions aren't either...
51-
# * In the 'pulp' scenario we use the published/prebuilt bindings, so we can test it.
52-
# * In other scenarios we generate new bindings from server spec, so we have a more
53-
# reliable client.
54-
if [ "$TEST" = "pulp" ]
55-
then
56-
BUILT_CLIENTS=" core file certguard "
57-
else
58-
BUILT_CLIENTS=""
59-
fi
49+
BUILT_CLIENTS=""
6050

6151
for ITEM in $(jq -r '.versions[] | tojson' <<<"${REPORTED_STATUS}")
6252
do

template_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ pulp_settings:
6666
task_protection_time: 10
6767
tmpfile_protection_time: 10
6868
upload_protection_time: 10
69+
domain_enabled: true
6970
pulp_settings_azure:
7071
MEDIA_ROOT: ""
7172
STORAGES:

0 commit comments

Comments
 (0)