From 9b8b1c331162460c570ac156ce285f2e6d36c70a Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 24 Sep 2023 02:31:09 +0000
Subject: [PATCH] Update CI files

[noissue]
---
 .ci/ansible/Containerfile.j2         | 12 ++++++++++++
 .github/template_gitref              |  2 +-
 .github/workflows/scripts/install.sh |  3 +++
 template_config.yml                  |  7 +++++--
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index 66f15a72..482ee277 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.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
diff --git a/.github/template_gitref b/.github/template_gitref
index c208a73b..e0764316 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-247-g1ee39ae
+2021.08.26-248-g4bfc3e1
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index 3c5f12c0..933b79c4 100755
--- a/.github/workflows/scripts/install.sh
+++ b/.github/workflows/scripts/install.sh
@@ -67,6 +67,7 @@ services:
 VARSYAML
 
 cat >> vars/main.yaml << VARSYAML
+pulp_env: {}
 pulp_settings: null
 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: null\
+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: null\
+pulp_scenario_env: {}\
 ' vars/main.yaml
 fi
 
diff --git a/template_config.yml b/template_config.yml
index c9ce7f09..b8c5cb79 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-244-g7bb934c
+# generated with plugin_template@2021.08.26-248-g4bfc3e1
 
 additional_repos: []
 api_root: /pulp/
@@ -47,12 +47,15 @@ plugin_snake: pulp_ostree
 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: null
 pulp_settings_azure: null
 pulp_settings_gcp: null
 pulp_settings_s3: null
-pulp_settings_stream: null
 pulpprojectdotorg_key_id: null
 pydocstyle: true
 pypi_username: pulp