From 5d81100bc22fd32addf6947a8baf10eacbcb8bd2 Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 3 Nov 2024 23:31:50 +0000
Subject: [PATCH] Update CI files

---
 .ci/ansible/Containerfile.j2         | 3 +--
 .ci/assets/ci_constraints.txt        | 5 -----
 .github/template_gitref              | 2 +-
 .github/workflows/nightly.yml        | 2 +-
 .github/workflows/scripts/install.sh | 2 +-
 .github/workflows/test.yml           | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index e4b863331..d57b44ed2 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -28,8 +28,7 @@ RUN pip3 install --upgrade pip setuptools wheel && \
 {{ " " }}-r ./{{ item.name }}/ci_requirements.txt
 {%- endif -%}
 {%- endfor %}
-{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt \
-  pipdeptree && \
+{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \
   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 14b515968..2617a4089 100644
--- a/.ci/assets/ci_constraints.txt
+++ b/.ci/assets/ci_constraints.txt
@@ -5,8 +5,3 @@ 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/.github/template_gitref b/.github/template_gitref
index 4fb36e960..77b8478b4 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-387-ge627e91
+2021.08.26-388-g624de1a
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 3c4933ee3..3ab77ff8c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -185,4 +185,4 @@ jobs:
           docker logs pulp || true
           docker exec pulp ls -latr /etc/yum.repos.d/ || true
           docker exec pulp cat /etc/yum.repos.d/* || true
-          docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
+          docker exec pulp bash -c "pip3 list" || true
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index b622329bc..64b69c39f 100755
--- a/.github/workflows/scripts/install.sh
+++ b/.github/workflows/scripts/install.sh
@@ -166,5 +166,5 @@ if [[ "$TEST" = "azure" ]]; then
 fi
 
 echo ::group::PIP_LIST
-cmd_prefix bash -c "pip3 list && pipdeptree"
+cmd_prefix bash -c "pip3 list"
 echo ::endgroup::
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7175ee868..4de0bf31b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -147,5 +147,5 @@ jobs:
           docker logs pulp || true
           docker exec pulp ls -latr /etc/yum.repos.d/ || true
           docker exec pulp cat /etc/yum.repos.d/* || true
-          docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
+          docker exec pulp bash -c "pip3 list" || true
 ...