From 5a259fdafe6db360df5d4a6ff218120e89196019 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 27 Sep 2023 13:49:35 +0200
Subject: [PATCH] Drop docker-py from requirements.txt

Since addition of podman - users need to install only one from docker|podman

Change-Id: I622eefad3b2e93f334028d9c0775a2cca558a39c
---
 requirements.txt        | 1 -
 test-requirements.txt   | 1 +
 tests/playbooks/pre.yml | 4 ++++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e949f8f5ab..f471843cf3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-docker>=3.0.0 # Apache-2.0
 Jinja2>=3.0.1 # BSD License (3 clause)
 GitPython>=1.0.1 # BSD License (3 clause)
 oslo.config>=5.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index e1185df8b4..d37daf377f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,6 +2,7 @@ bandit!=1.6.0,>=1.1.0 # Apache-2.0
 bashate>=0.5.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
+docker>=3.0.0 # Apache-2.0
 hacking>=3.0.1,<3.1.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 stestr>=2.2.0 # Apache-2.0
diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml
index 01ded11b05..2e0e91bc63 100644
--- a/tests/playbooks/pre.yml
+++ b/tests/playbooks/pre.yml
@@ -42,6 +42,10 @@
     - name: Install kolla
       command: "{{ virtualenv_path }}/bin/python -m pip install {{ zuul.project.src_dir }}"
 
+    - name: Install docker python library
+      command: "{{ virtualenv_path }}/bin/python -m pip install docker"
+      when: container_engine == "docker"
+
     - name: Install podman python library
       command: "{{ virtualenv_path }}/bin/python -m pip install podman"
       when: container_engine == "podman"