Update CI files

[noissue]

.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 -%}

.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 = ""

.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

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-237-g4bbee21
+2021.08.26-240-gd3a60ef

.github/workflows/ci.yml

@@ -104,11 +104,9 @@ jobs:
           - TEST: docs
           - TEST: azure
           - TEST: s3
-          - TEST: stream
           - TEST: lowerbounds
     outputs:
       deprecations-pulp: ${{ steps.deprecations.outputs.deprecations-pulp }}
-      deprecations-stream: ${{ steps.deprecations.outputs.deprecations-stream }}
       deprecations-azure: ${{ steps.deprecations.outputs.deprecations-azure }}
       deprecations-s3: ${{ steps.deprecations.outputs.deprecations-s3 }}
       deprecations-lowerbounds: ${{ steps.deprecations.outputs.deprecations-lowerbounds }}
@@ -215,15 +213,13 @@ jobs:
       - name: Fail on deprecations
         run: |
           test -z "${{ needs.test.outputs.deprecations-pulp }}"
-          test -z "${{ needs.test.outputs.deprecations-stream }}"
           test -z "${{ needs.test.outputs.deprecations-azure }}"
           test -z "${{ needs.test.outputs.deprecations-s3 }}"
           test -z "${{ needs.test.outputs.deprecations-lowerbounds }}"
       - name: Print deprecations
         if: failure()
         run: |
           echo "${{ needs.test.outputs.deprecations-pulp }}" | base64 -d
-          echo "${{ needs.test.outputs.deprecations-stream }}" | base64 -d
           echo "${{ needs.test.outputs.deprecations-azure }}" | base64 -d
           echo "${{ needs.test.outputs.deprecations-s3 }}" | base64 -d
           echo "${{ needs.test.outputs.deprecations-lowerbounds }}" | base64 -d

.github/workflows/nightly.yml

@@ -30,7 +30,6 @@ jobs:
           - TEST: docs
           - TEST: azure
           - TEST: s3
-          - TEST: stream
 
           - TEST: generate-bindings
           - TEST: lowerbounds

.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

.github/workflows/scripts/install.sh

@@ -73,7 +73,7 @@ pulp_container_tag: https
 
 VARSYAML
 
-SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "stream" "generate-bindings" "lowerbounds")
+SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "generate-bindings" "lowerbounds")
 if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
   sed -i -e '/^services:/a \
   - name: pulp-fixtures\
@@ -82,17 +82,6 @@ if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
 
   export REMOTE_FIXTURES_ORIGIN="http://pulp-fixtures:8080"
 fi
-if [ "$TEST" == 'stream' ]; then
-  sed -i -e '/^services:/a \
-  - name: ci-sftp\
-    image: atmoz/sftp\
-    volumes:\
-      - ./ssh/id_ed25519.pub:/home/foo/.ssh/keys/id_ed25519.pub\
-    command: "foo::::storage"' vars/main.yaml
-  sed -i -e '$a stream_test: true\
-pulp_scenario_settings: null\
-' vars/main.yaml
-fi
 
 if [ "$TEST" = "s3" ]; then
   export MINIO_ACCESS_KEY=AKIAIT2Z5TDYPX3ARJBA

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-223-g9040550
+# generated with plugin_template@2021.08.26-240-gd3a60ef
 
 additional_repos:
 - branch: main
@@ -94,7 +94,6 @@ test_lowerbounds: true
 test_performance: true
 test_reroute: true
 test_s3: true
-test_stream: true
 update_github: true
 use_issue_template: true