From 55216489b75f2d7a8ec8f3be75de1042bdd67646 Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 22 Sep 2024 17:33:17 +0000
Subject: [PATCH] Update CI files

---
 .ci/ansible/Containerfile.j2  | 5 +++--
 .ci/assets/ci_constraints.txt | 5 +++++
 .ci/scripts/pr_labels.py      | 9 ++++++---
 .github/template_gitref       | 2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index 360c1c6a60..e4b8633316 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -12,7 +12,7 @@ ADD ./{{ item.name }} ./{{ item.name }}
 # 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 pipdeptree
+  pip3 install
 {%- if s3_test | default(false) -%}
 {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue
 {%- endif -%}
@@ -28,7 +28,8 @@ RUN pip3 install --upgrade pip setuptools wheel && \
 {{ " " }}-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 \
+  pipdeptree && \
   rm -rf /root/.cache/pip
 
 {% if pulp_env is defined and pulp_env %}
diff --git a/.ci/assets/ci_constraints.txt b/.ci/assets/ci_constraints.txt
index 2617a40896..14b515968b 100644
--- a/.ci/assets/ci_constraints.txt
+++ b/.ci/assets/ci_constraints.txt
@@ -5,3 +5,8 @@ pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*
 
 tablib!=3.6.0
 # 3.6.0: This release introduced a regression removing the "html" optional dependency.
+
+
+
+# Newer version seem to have a conflict around packaging, that pip fails to resolve in time. Remove this when this starts to impose an issue.
+pipdeptree<=3.23.1
diff --git a/.ci/scripts/pr_labels.py b/.ci/scripts/pr_labels.py
index 9d637b6b2a..24edc73247 100755
--- a/.ci/scripts/pr_labels.py
+++ b/.ci/scripts/pr_labels.py
@@ -18,9 +18,12 @@ def main():
     BLOCKING_REGEX = re.compile(r"DRAFT|WIP|NO\s*MERGE|DO\s*NOT\s*MERGE|EXPERIMENT")
     ISSUE_REGEX = re.compile(r"(?:fixes|closes)[\s:]+#(\d+)")
     CHERRY_PICK_REGEX = re.compile(r"^\s*\(cherry picked from commit [0-9a-f]*\)\s*$")
-    CHANGELOG_EXTS = [
-        f".{item['directory']}" for item in PYPROJECT_TOML["tool"]["towncrier"]["type"]
-    ]
+    try:
+        CHANGELOG_EXTS = {
+            f".{item['directory']}" for item in PYPROJECT_TOML["tool"]["towncrier"]["type"]
+        }
+    except KeyError:
+        CHANGELOG_EXTS = {"feature", "bugfix", "doc", "removal", "misc"}
 
     repo = Repo(".")
 
diff --git a/.github/template_gitref b/.github/template_gitref
index 54bb08e8e2..1691300c87 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-382-gc88324b
+2021.08.26-383-gc4cd2b8