From 09754081cd464c76ba23a6991d82f630ab9f9c14 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Mon, 9 Sep 2024 10:19:42 +0000 Subject: [PATCH] Update CI files [noissue] --- .ci/ansible/Containerfile.j2 | 3 ++- .github/template_gitref | 2 +- .github/workflows/scripts/install.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2 index afe0b118d..360c1c6a6 100644 --- a/.ci/ansible/Containerfile.j2 +++ b/.ci/ansible/Containerfile.j2 @@ -9,9 +9,10 @@ ADD ./{{ item.name }} ./{{ item.name }} # S3 botocore needs to be patched to handle responses from minio during 0-byte uploads # Hacking botocore (https://github.com/boto/botocore/pull/1990) +# This MUST be the ONLY call to pip install in inside the container. RUN pip3 install --upgrade pip setuptools wheel && \ rm -rf /root/.cache/pip && \ - pip3 install + pip3 install pipdeptree {%- if s3_test | default(false) -%} {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue {%- endif -%} diff --git a/.github/template_gitref b/.github/template_gitref index 3e3784896..adfc6a8fc 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-379-gece49c9 +2021.08.26-380-g46e00a5 diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 351a0fa1e..2877bbbb0 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -156,5 +156,5 @@ if [[ "$TEST" = "azure" ]]; then fi echo ::group::PIP_LIST -cmd_prefix bash -c "pip3 list && pip3 install pipdeptree && pipdeptree" +cmd_prefix bash -c "pip3 list && pipdeptree" echo ::endgroup::