diff options
| author | Zuul <zuul@review.opendev.org> | 2023-11-29 10:19:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-11-29 10:19:49 +0000 |
| commit | 54e05af7e57c381aef244d8d39395e058e951394 (patch) | |
| tree | 8fe5da34afc94e5f845924d0e6524630f2b2585a | |
| parent | 5c7c9b5a8173967ba527c01f8cc93606b1b31362 (diff) | |
| parent | 5a259fdafe6db360df5d4a6ff218120e89196019 (diff) | |
| download | kolla-54e05af7e57c381aef244d8d39395e058e951394.tar.gz kolla-54e05af7e57c381aef244d8d39395e058e951394.zip | |
Merge "Drop docker-py from requirements.txt"
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tests/playbooks/pre.yml | 4 |
3 files changed, 5 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index e949f8f5a..f471843cf 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 e1185df8b..d37daf377 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 01ded11b0..2e0e91bc6 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" |