From fccc1bd25f60657861d8c7798fafc09e029b8b2c Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 1 Dec 2024 14:36:17 +0000
Subject: [PATCH] Update CI files

---
 .ci/scripts/check_requirements.py                |  5 ++++-
 .github/template_gitref                          |  2 +-
 .github/workflows/ci.yml                         |  3 +++
 .github/workflows/nightly.yml                    |  4 ++++
 .github/workflows/scripts/publish_plugin_pypi.sh |  4 ++--
 .github/workflows/test.yml                       | 14 +++++---------
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.ci/scripts/check_requirements.py b/.ci/scripts/check_requirements.py
index fc66b23d6..c8bd136f0 100755
--- a/.ci/scripts/check_requirements.py
+++ b/.ci/scripts/check_requirements.py
@@ -62,7 +62,10 @@ def main():
                 else:
                     if check_prereleases and req.specifier.prereleases:
                         # Do not even think about begging for more exceptions!
-                        if req.name != "pulp-ansible-client":
+                        if (
+                            not req.name.startswith("opentelemetry")
+                            and req.name != "pulp-ansible-client"
+                        ):
                             errors.append(f"{filename}:{nr}: Prerelease versions found in {line}.")
                     ops = [spec.operator for spec in req.specifier]
                     if "~=" in ops:
diff --git a/.github/template_gitref b/.github/template_gitref
index 483b6b6b3..70eef8995 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-401-g1346b63
+2021.08.26-405-g3845bbc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a14beae46..e42ef03a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,6 +56,9 @@ jobs:
   test:
     needs: "build"
     uses: "./.github/workflows/test.yml"
+    with:
+      matrix_env: |
+        [{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}]
 
   deprecations:
     runs-on: "ubuntu-latest"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4c5f44e01..6c6e847ad 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -29,6 +29,9 @@ jobs:
   test:
     needs: "build"
     uses: "./.github/workflows/test.yml"
+    with:
+      matrix_env: |
+        [{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}]
 
   changelog:
     runs-on: ubuntu-latest
@@ -65,3 +68,4 @@ jobs:
           branch: "changelog/update"
           delete-branch: true
           path: "pulp_ansible"
+...
diff --git a/.github/workflows/scripts/publish_plugin_pypi.sh b/.github/workflows/scripts/publish_plugin_pypi.sh
index 43c20666a..51cd5bbea 100755
--- a/.github/workflows/scripts/publish_plugin_pypi.sh
+++ b/.github/workflows/scripts/publish_plugin_pypi.sh
@@ -28,6 +28,6 @@ then
 fi
 
 twine upload -u __token__ -p "$PYPI_API_TOKEN" \
-"dist/pulp_ansible-$VERSION-py3-none-any.whl" \
-"dist/pulp-ansible-$VERSION.tar.gz" \
+dist/pulp?ansible-"$VERSION"-py3-none-any.whl \
+dist/pulp?ansible-"$VERSION".tar.gz \
 ;
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e7624080b..9b9d52655 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,6 +9,10 @@
 name: "Test"
 on:
   workflow_call:
+    inputs:
+      matrix_env:
+        required: true
+        type: string
 
 defaults:
   run:
@@ -20,11 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        env:
-          - TEST: pulp
-          - TEST: azure
-          - TEST: s3
-          - TEST: lowerbounds
+        env: ${{ fromJSON(inputs.matrix_env) }}
 
     steps:
       - uses: "actions/checkout@v4"
@@ -88,10 +88,6 @@ jobs:
           ANSIBLE_FORCE_COLOR: "1"
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
-      - uses: ruby/setup-ruby@v1
-        if: ${{ env.TEST == 'pulp' }}
-        with:
-          ruby-version: "2.6"
 
       - name: "Install"
         run: |