From 61b1255809af1ffd1f7f2bd6187298e1f6ef1524 Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Mon, 2 Jan 2023 17:24:32 +0000
Subject: [PATCH] Update CI files

[noissue]
---
 .ci/ansible/Containerfile.j2               | 3 +++
 .ci/ansible/settings.py.j2                 | 7 +++++++
 .github/template_gitref                    | 2 +-
 .github/workflows/scripts/before_script.sh | 4 ++--
 template_config.yml                        | 9 +++++++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index 47c3d02e7..72491d9b8 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -20,6 +20,9 @@ RUN pip3 install \
 {%- if azure_test | default(false) -%}
 {{ " " }}django-storages[azure]>=1.12.2
 {%- endif -%}
+{%- if gcp_test | default(false) -%}
+{{ " " }}django-storages[google]>=1.13.2
+{%- endif -%}
 {%- for item in plugins -%}
 {%- if item.name == "pulp-certguard" -%}
 {{ " " }}python-dateutil rhsm
diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2
index 2dad67112..9470aafa0 100644
--- a/.ci/ansible/settings.py.j2
+++ b/.ci/ansible/settings.py.j2
@@ -63,3 +63,10 @@ AZURE_OVERWRITE_FILES = True
 AZURE_URL_EXPIRATION_SECS = 120
 AZURE_CONNECTION_STRING = 'DefaultEndpointsProtocol={{ pulp_scheme }};AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint={{ pulp_scheme }}://ci-azurite:10000/devstoreaccount1;'
 {% endif %}
+
+{% if gcp_test | default(false) %}
+DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+MEDIA_ROOT = ""
+GS_BUCKET_NAME = "gcppulp"
+GS_CUSTOM_ENDPOINT = "http://ci-gcp:4443"
+{% endif %}
diff --git a/.github/template_gitref b/.github/template_gitref
index 67043e091..a5935fd07 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-190-ge8465b5
+2021.08.26-191-g8c3448a
diff --git a/.github/workflows/scripts/before_script.sh b/.github/workflows/scripts/before_script.sh
index fd0e6ba10..06e5de5b6 100755
--- a/.github/workflows/scripts/before_script.sh
+++ b/.github/workflows/scripts/before_script.sh
@@ -33,10 +33,10 @@ tail -v -n +1 .ci/ansible/settings/settings.* ~/.config/pulp_smash/settings.json
 cmd_prefix bash -c "echo '%wheel        ALL=(ALL)       NOPASSWD: ALL' > /etc/sudoers.d/nopasswd"
 cmd_prefix bash -c "usermod -a -G wheel pulp"
 
-SCENARIOS=("pulp" "performance" "azure" "s3" "stream" "plugin-from-pypi" "generate-bindings" "lowerbounds")
+SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "stream" "plugin-from-pypi" "generate-bindings" "lowerbounds")
 if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
   # Many functional tests require these
-  cmd_prefix dnf install -yq lsof which dnf-plugins-core
+  cmd_prefix dnf install -yq lsof which
 fi
 
 if [[ "${REDIS_DISABLED:-false}" == true ]]; then
diff --git a/template_config.yml b/template_config.yml
index 37a6a3a33..ca0f7c261 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-174-g56e0727
+# generated with plugin_template@2021.08.26-191-g8c3448a
 
 additional_repos: []
 aiohttp_fixtures_origin: 172.18.0.1
@@ -16,7 +16,10 @@ check_openapi_schema: true
 check_stray_pulpcore_imports: true
 ci_env: {}
 ci_trigger: '{pull_request: {branches: [''*'']}}'
-ci_update_branches: ["2.9", "2.10", "2.14"]
+ci_update_branches:
+- '2.9'
+- '2.10'
+- '2.14'
 core_import_allowed: []
 coverage: false
 deploy_client_to_pypi: true
@@ -61,6 +64,7 @@ pulp_settings:
   allowed_import_paths:
   - /tmp
 pulp_settings_azure: null
+pulp_settings_gcp: null
 pulp_settings_s3: null
 pulp_settings_stream: null
 pulpcore_branch: main
@@ -85,6 +89,7 @@ test_azure: true
 test_bindings: false
 test_cli: true
 test_deprecations: true
+test_gcp: false
 test_performance: false
 test_released_plugin_with_next_pulpcore_release: false
 test_reroute: true