Update CI files (#1588)

[noissue]

.ci/ansible/Containerfile.j2

@@ -30,6 +30,18 @@ RUN pip3 install
 {%- endif -%}
 {%- endfor %}
 
+{% if pulp_env is defined and pulp_env %}
+{% for key, value in pulp_env.items() %}
+ENV {{ key | upper }}={{ value }}
+{% endfor %}
+{% endif %}
+
+{% if pulp_scenario_env is defined and pulp_scenario_env %}
+{% for key, value in pulp_scenario_env.items() %}
+ENV {{ key | upper }}={{ value }}
+{% endfor %}
+{% endif %}
+
 USER pulp:pulp
 RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \
        /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-247-g1ee39ae
+2021.08.26-248-g4bfc3e1

.github/workflows/scripts/install.sh

@@ -67,6 +67,7 @@ services:
 VARSYAML
 
 cat >> vars/main.yaml << VARSYAML
+pulp_env: {}
 pulp_settings: {"allowed_export_paths": "/tmp", "allowed_import_paths": "/tmp", "ansible_api_hostname": "https://pulp:443", "ansible_content_hostname": "https://pulp:443/pulp/content", "ansible_signature_require_verification": false}
 pulp_scheme: https
 
@@ -88,6 +89,7 @@ if [ "$TEST" = "s3" ]; then
 minio_access_key: "'$MINIO_ACCESS_KEY'"\
 minio_secret_key: "'$MINIO_SECRET_KEY'"\
 pulp_scenario_settings: {"ansible_collect_download_count": true, "ansible_collect_download_log": true}\
+pulp_scenario_env: {}\
 ' vars/main.yaml
   export PULP_API_ROOT="/rerouted/djnd/"
 fi
@@ -107,6 +109,7 @@ if [ "$TEST" = "azure" ]; then
     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\
 pulp_scenario_settings: {"ansible_collect_download_count": true, "ansible_collect_download_log": false}\
+pulp_scenario_env: {}\
 ' vars/main.yaml
 fi
 

docs/template_gitref

@@ -1 +1 @@
-2021.08.26-247-g1ee39ae
+2021.08.26-248-g4bfc3e1

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 [email protected]241-g9cfc63e
+# generated with [email protected]248-g4bfc3e1
 
 additional_repos: []
 api_root: /pulp/
@@ -53,6 +53,10 @@ plugin_snake: pulp_ansible
 post_job_template: null
 pre_job_template: null
 publish_docs_to_pulpprojectdotorg: true
+pulp_env: {}
+pulp_env_azure: {}
+pulp_env_gcp: {}
+pulp_env_s3: {}
 pulp_scheme: https
 pulp_settings:
   allowed_export_paths: /tmp
@@ -69,7 +73,6 @@ pulp_settings_gcp:
 pulp_settings_s3:
   ansible_collect_download_count: true
   ansible_collect_download_log: true
-pulp_settings_stream: null
 pulpprojectdotorg_key_id: aa499d7938ed
 pydocstyle: true
 pypi_username: pulp