diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2 index 1a76b5d5..16d3a3a5 100644 --- a/.ci/ansible/settings.py.j2 +++ b/.ci/ansible/settings.py.j2 @@ -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 }} @@ -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" diff --git a/.github/template_gitref b/.github/template_gitref index f03691ba..0d2772c8 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-167-ga2a8251 +2021.08.26-170-g40698bb diff --git a/template_config.yml b/template_config.yml index 7fceb696..07b139c5 100644 --- a/template_config.yml +++ b/template_config.yml @@ -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 plugin_template@2021.08.26-167-ga2a8251 +# generated with plugin_template@2021.08.26-170-g40698bb additional_repos: - branch: '1.10' @@ -38,7 +38,7 @@ docker_fixtures: false docs_test: true flake8: true flake8_ignore: - - ./pulp_2to3_migration/app/json_schema.py +- ./pulp_2to3_migration/app/json_schema.py github_org: pulp issue_tracker: github keep_ci_update_for_latest_branches: 5 @@ -61,6 +61,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: '3.19' pulpcore_pip_version_specifier: ~=3.19.0 pulpcore_revision: null