From cdf063f626ca7b51e5ea176644478a1edc2238c6 Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 30 Jul 2023 02:35:56 +0000
Subject: [PATCH] Update CI files

[noissue]
---
 .ci/ansible/Containerfile.j2               |  3 ---
 .ci/ansible/settings.py.j2                 | 12 ------------
 .ci/ansible/start_container.yaml           |  8 --------
 .github/template_gitref                    |  2 +-
 .github/workflows/scripts/before_script.sh |  2 +-
 template_config.yml                        |  3 +--
 6 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index 64225b9d..66f15a72 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -11,9 +11,6 @@ ADD ./{{ item.name }} ./{{ item.name }}
 # Hacking botocore (https://github.com/boto/botocore/pull/1990)
 
 RUN pip3 install
-{%- if stream_test | default(false) -%}
-{{ " " }}django-storages[sftp]
-{%- endif -%}
 {%- if s3_test | default(false) -%}
 {{ " " }}django-storages[boto3] git+https://github.com/fabricio-aguiar/botocore.git@fix-100-continue
 {%- endif -%}
diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2
index 9470aafa..024df4e4 100644
--- a/.ci/ansible/settings.py.j2
+++ b/.ci/ansible/settings.py.j2
@@ -26,18 +26,6 @@ API_ROOT = {{ api_root | repr }}
 {% endfor %}
 {% endif %}
 
-{% if stream_test | default(false) -%}
-REDIRECT_TO_OBJECT_STORAGE = False
-DEFAULT_FILE_STORAGE = "pulpcore.app.models.storage.PulpSFTPStorage"
-MEDIA_ROOT = ""
-SFTP_STORAGE_HOST = "ci-sftp"
-SFTP_STORAGE_ROOT = "/storage/"
-SFTP_STORAGE_PARAMS = {
-    "username": "foo",
-    "key_filename": "/keys/id_ed25519",
-}
-{%- endif %}
-
 {% if s3_test | default(false) %}
 DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 MEDIA_ROOT = ""
diff --git a/.ci/ansible/start_container.yaml b/.ci/ansible/start_container.yaml
index a05edc0b..b19a2054 100644
--- a/.ci/ansible/start_container.yaml
+++ b/.ci/ansible/start_container.yaml
@@ -15,14 +15,6 @@
         - ssh
         - ~/.config/pulp_smash
 
-    - name: Generate an OpenSSH keypair
-      community.crypto.openssh_keypair:
-        path: ssh/id_ed25519
-        type: ed25519
-        owner: 700  # pulp in the container
-      become: true
-      when: stream_test | default(false)
-
     - name: "Generate Pulp Settings"
       template:
         src: settings.py.j2
diff --git a/.github/template_gitref b/.github/template_gitref
index 341daaf8..8f9ce5e5 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-237-g4bbee21
+2021.08.26-240-gd3a60ef
diff --git a/.github/workflows/scripts/before_script.sh b/.github/workflows/scripts/before_script.sh
index 8336fd77..46bde295 100755
--- a/.github/workflows/scripts/before_script.sh
+++ b/.github/workflows/scripts/before_script.sh
@@ -36,7 +36,7 @@ tail -v -n +1 .ci/ansible/Containerfile
 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" "gcp" "s3" "stream" "generate-bindings" "lowerbounds")
+SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "generate-bindings" "lowerbounds")
 if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
   # Many functional tests require these
   cmd_prefix dnf install -yq lsof which
diff --git a/template_config.yml b/template_config.yml
index 8ec811f4..d868ba60 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-233-gd6a6b5f
+# generated with plugin_template@2021.08.26-240-gd3a60ef
 
 additional_repos:
 - branch: main
@@ -76,7 +76,6 @@ test_lowerbounds: true
 test_performance: false
 test_reroute: true
 test_s3: true
-test_stream: false
 update_github: true
 use_issue_template: true