From c47ef97f73ab41b214636123af27873c9962d583 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 5 May 2023 16:24:09 +0200
Subject: [PATCH] [stable-only] Work around docker-py requests/urllib3 issue

Removing upgrade jobs as well as those would fail
and Victoria is long time EOL.

[1]: https://github.com/docker/docker-py/issues/3113

Change-Id: I71fa25a440eb80fa488aaf94f9d778b4d23e0181
(cherry picked from commit 869e3313ecc740e906bb1c10ba0603b95ce3d73d)
---
 ansible/roles/baremetal/tasks/install.yml | 6 +++++-
 zuul.d/project.yaml                       | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/baremetal/tasks/install.yml b/ansible/roles/baremetal/tasks/install.yml
index 33bf0c6530..e72cfcc866 100644
--- a/ansible/roles/baremetal/tasks/install.yml
+++ b/ansible/roles/baremetal/tasks/install.yml
@@ -159,7 +159,11 @@
   pip:
     # NOTE(hrw) docker 2.4.2 is in kolla-ansible requirements
     # NOTE(mnasiadka): docker 5.0.0 lacks six in deps but requires it
-    name: docker>=2.4.2,<5.0.0
+    # NOTE(mnasiadka): requests and urllib3 as a workaround for https://github.com/docker/docker-py/issues/3113
+    name:
+      - "docker>=2.4.2,<5.0.0"
+      - "requests<2.29.0"
+      - "urllib3<2"
     executable: "{{ virtualenv is none | ternary('pip3', omit) }}"
     virtualenv: "{{ virtualenv is none | ternary(omit, virtualenv) }}"
     virtualenv_site_packages: "{{ virtualenv is none | ternary(omit, virtualenv_site_packages) }}"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3b343f1f8d..2421ebea5e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,7 +2,6 @@
 - project:
     queue: kolla
     templates:
-      - check-requirements
       - openstack-cover-jobs
       - openstack-python3-xena-jobs
       - ansible-role-jobs