From 2f6131b2d98ef616506e58bb103272c74911db15 Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 21 Jul 2024 02:41:14 +0000
Subject: [PATCH] Update CI files

[noissue]
---
 .ci/ansible/Containerfile.j2                  |  7 +++++--
 .ci/scripts/calc_constraints.py               |  2 ++
 .github/template_gitref                       |  2 +-
 .github/workflows/nightly.yml                 | 20 +++++++++++++++++++
 .../workflows/scripts/build_python_client.sh  |  4 +---
 .../workflows/scripts/build_ruby_client.sh    | 10 +---------
 docs/template_gitref                          |  2 +-
 7 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index 6cf81f25..afe0b118 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -9,7 +9,9 @@ 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)
 
-RUN pip3 install
+RUN pip3 install --upgrade pip setuptools wheel && \
+  rm -rf /root/.cache/pip && \
+  pip3 install
 {%- if s3_test | default(false) -%}
 {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue
 {%- endif -%}
@@ -25,7 +27,8 @@ RUN pip3 install
 {{ " " }}-r ./{{ item.name }}/ci_requirements.txt
 {%- endif -%}
 {%- endfor %}
-{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt
+{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \
+  rm -rf /root/.cache/pip
 
 {% if pulp_env is defined and pulp_env %}
 {% for key, value in pulp_env.items() %}
diff --git a/.ci/scripts/calc_constraints.py b/.ci/scripts/calc_constraints.py
index a29b5ee2..0497911f 100755
--- a/.ci/scripts/calc_constraints.py
+++ b/.ci/scripts/calc_constraints.py
@@ -62,6 +62,8 @@ def to_upper_bound(req):
                     max_version = f"{version.major}.{version.minor}.{version.micro-1}"
                 elif version.minor != 0:
                     max_version = f"{version.major}.{version.minor-1}"
+                elif version.major != 0:
+                    max_version = f"{version.major-1}.0"
                 else:
                     return f"# NO BETTER CONSTRAINT: {req}"
                 return f"{requirement.name}{operator}{max_version}"
diff --git a/.github/template_gitref b/.github/template_gitref
index c16f42b6..3d9674dc 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-354-g82d22de
+2021.08.26-361-gcd6f9f0
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4af2fb22..404b1341 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -98,6 +98,26 @@ jobs:
           name: "plugin_package"
           path: "pulp_deb/dist/"
 
+      - name: "Download API specs"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "api_spec"
+          path: "pulp_deb/"
+
+      - name: "Download client packages"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "python-client.tar"
+          path: "pulp_deb"
+
+      - name: "Unpack client packages"
+        working-directory: "pulp-openapi-generator"
+        run: |
+          mkdir -p "pulp_deb-client"
+          pushd "pulp_deb-client"
+          tar xvf "../../pulp_deb/deb-python-client.tar"
+          popd
+
       - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
diff --git a/.github/workflows/scripts/build_python_client.sh b/.github/workflows/scripts/build_python_client.sh
index 51418132..88afbef2 100755
--- a/.github/workflows/scripts/build_python_client.sh
+++ b/.github/workflows/scripts/build_python_client.sh
@@ -18,9 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 pushd ../pulp-openapi-generator
 rm -rf "pulp_deb-client"
 
-# We need to copy that over to be visible in the container.
-cp "../pulp_deb/deb-api.json" .
-./gen-client.sh "deb-api.json" "deb" python "pulp_deb"
+./gen-client.sh "../pulp_deb/deb-api.json" "deb" python "pulp_deb"
 
 pushd pulp_deb-client
 python setup.py sdist bdist_wheel --python-tag py3
diff --git a/.github/workflows/scripts/build_ruby_client.sh b/.github/workflows/scripts/build_ruby_client.sh
index 8e01b287..feb1ec39 100755
--- a/.github/workflows/scripts/build_ruby_client.sh
+++ b/.github/workflows/scripts/build_ruby_client.sh
@@ -18,15 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 pushd ../pulp-openapi-generator
 rm -rf "pulp_deb-client"
 
-# We need to copy that over to be visible in the container.
-#cp "../pulp_deb/deb-api.json" .
-#./gen-client.sh "deb-api.json" "deb" ruby "pulp_deb"
-
-# -------------
-# The generator still needs to have it called api.json at this time...
-cp "../pulp_deb/api.json" .
-./gen-client.sh "api.json" "deb" ruby "pulp_deb"
-# -------------
+./gen-client.sh "../pulp_deb/deb-api.json" "deb" ruby "pulp_deb"
 
 pushd pulp_deb-client
 gem build pulp_deb_client
diff --git a/docs/template_gitref b/docs/template_gitref
index c16f42b6..3d9674dc 100644
--- a/docs/template_gitref
+++ b/docs/template_gitref
@@ -1 +1 @@
-2021.08.26-354-g82d22de
+2021.08.26-361-gcd6f9f0