From 6a9c6b092ba464ed358d1b40b84a708c1bd95d94 Mon Sep 17 00:00:00 2001 From: Alexander Hughes Date: Wed, 17 Jun 2020 08:36:40 -0400 Subject: [PATCH] Fix image build checks missing setuptools Use apt to install python3-pip, and use pip3 in event system has both pip2 and pip3 installed. Use apt to install setuptools for Ansible's consumption. Change-Id: Id80c809c636abe41a1cbb4d465f82ed1e8e0e9d7 Signed-off-by: Alexander Hughes --- python/requirements-test.txt | 2 +- tools/gate/playbooks/docker-image-build.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/python/requirements-test.txt b/python/requirements-test.txt index 0d6ca35f..0bc2eeba 100644 --- a/python/requirements-test.txt +++ b/python/requirements-test.txt @@ -1,4 +1,4 @@ -pytest-mock +pytest-mock==3.1.0 pytest pytest-cov responses diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml index f1853305..5e674ab5 100644 --- a/tools/gate/playbooks/docker-image-build.yaml +++ b/tools/gate/playbooks/docker-image-build.yaml @@ -47,10 +47,13 @@ with_items: - docker.io - python-pip + - python-setuptools + - python3-setuptools when: ansible_os_family == 'Debian' - pip: name: docker version: 2.7.0 + executable: pip become: True - name: Make images