From d42303ffcf0ca9523fa8ca6b0bb8986d98110323 Mon Sep 17 00:00:00 2001
From: Tobias Grigo <grigo@atix.de>
Date: Wed, 6 Dec 2023 16:09:03 +0100
Subject: [PATCH] Revert a ci change regarding cloud storage

[noissue]
---
 .ci/ansible/Containerfile.j2 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index 0eb5d5ccb..482ee277c 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -8,22 +8,23 @@ ADD ./{{ item.name }} ./{{ item.name }}
 {% endfor %}
 
 # Install python packages
+# Hacking botocore (https://github.com/boto/botocore/pull/1990)
 
 RUN pip3 install
+{%- if s3_test | default(false) -%}
+{{ " " }}django-storages[boto3] git+https://github.com/fabricio-aguiar/botocore.git@fix-100-continue
+{%- endif -%}
+{%- 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
 {%- endif -%}
 {{ " " }}{{ item.source }}
-{%- if item.name == "pulpcore" -%}
-{%- if s3_test | default(false) -%}
-[s3]
-{%- elif azure_test | default(false) -%}
-[azure]
-{%- elif gcp_test | default(false) -%}
-[google]
-{%- endif -%}
-{%- endif -%}
 {%- if item.ci_requirements | default(false) -%}
 {{ " " }}-r ./{{ item.name }}/ci_requirements.txt
 {%- endif -%}