Skip to content

Commit

Permalink
Update CI files
Browse files Browse the repository at this point in the history
[noissue]
  • Loading branch information
pulpbot authored and lubosmj committed Sep 21, 2022
1 parent dd1b565 commit efca61f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
7 changes: 7 additions & 0 deletions .ci/ansible/settings.py.j2
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ TOKEN_SIGNATURE_ALGORITHM = "ES256"
CACHE_ENABLED = True
REDIS_HOST = "localhost"
REDIS_PORT = 6379
TELEMETRY = False

{% if api_root is defined %}
API_ROOT = {{ api_root | repr }}
Expand All @@ -19,6 +20,12 @@ API_ROOT = {{ api_root | repr }}
{% endfor %}
{% endif %}

{% if pulp_scenario_settings is defined and pulp_scenario_settings %}
{% for key, value in pulp_scenario_settings.items() %}
{{ key | upper }} = {{ value | repr }}
{% endfor %}
{% endif %}

{% if stream_test | default(false) -%}
REDIRECT_TO_OBJECT_STORAGE = False
DEFAULT_FILE_STORAGE = "pulpcore.app.models.storage.PulpSFTPStorage"
Expand Down
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-168-g5c80b54
2021.08.26-170-g40698bb
8 changes: 6 additions & 2 deletions .github/workflows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ if [ "$TEST" = "s3" ]; then
command: "server /data"' vars/main.yaml
sed -i -e '$a s3_test: true\
minio_access_key: "'$MINIO_ACCESS_KEY'"\
minio_secret_key: "'$MINIO_SECRET_KEY'"' vars/main.yaml
minio_secret_key: "'$MINIO_SECRET_KEY'"\
pulp_scenario_settings: null\
' vars/main.yaml
export PULP_API_ROOT="/rerouted/djnd/"
fi

Expand All @@ -111,7 +113,9 @@ if [ "$TEST" = "azure" ]; then
volumes:\
- ./azurite:/etc/pulp\
command: "azurite-blob --blobHost 0.0.0.0 --cert /etc/pulp/azcert.pem --key /etc/pulp/azkey.pem"' vars/main.yaml
sed -i -e '$a azure_test: true' vars/main.yaml
sed -i -e '$a azure_test: true\
pulp_scenario_settings: null\
' vars/main.yaml
fi

echo "PULP_API_ROOT=${PULP_API_ROOT}" >> "$GITHUB_ENV"
Expand Down
5 changes: 4 additions & 1 deletion template_config.yml
Original file line number Diff line number Diff line change
@@ -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 [email protected]168-g5c80b54
# generated with [email protected]170-g40698bb

additional_repos: []
aiohttp_fixtures_origin: 172.18.0.1
Expand Down Expand Up @@ -48,6 +48,9 @@ pre_job_template: null
publish_docs_to_pulpprojectdotorg: true
pulp_scheme: https
pulp_settings: null
pulp_settings_azure: null
pulp_settings_s6: null
pulp_settings_stream: null
pulpcore_branch: main
pulpcore_pip_version_specifier: null
pulpcore_revision: null
Expand Down

0 comments on commit efca61f

Please sign in to comment.