From 9447bb867c344314c0aaacf5a6f957aa7b793c9c Mon Sep 17 00:00:00 2001 From: Alexander Hughes Date: Wed, 17 Jun 2020 08:29: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: Id6a82fef4ae1fc6f9ed754f192f0e40c55f92eb2 Signed-off-by: Alexander Hughes --- .../playbooks/airship-porthole-gate-runner.yaml | 13 +++++++++++++ tools/gate/playbooks/docker-image-build.yaml | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/gate/playbooks/airship-porthole-gate-runner.yaml b/tools/gate/playbooks/airship-porthole-gate-runner.yaml index aae7b981..f7a454c9 100644 --- a/tools/gate/playbooks/airship-porthole-gate-runner.yaml +++ b/tools/gate/playbooks/airship-porthole-gate-runner.yaml @@ -12,6 +12,19 @@ - hosts: primary tasks: + - name: install python + apt: + name: "{{ item }}" + allow_unauthenticated: True + with_items: + - python3-pip + - python3-setuptools + become: true + - name: ensure tox is present + pip: + name: tox + executable: pip3 + become: true - name: Run gate scripts include_role: name: osh-run-script diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml index 26439b96..b4571952 100644 --- a/tools/gate/playbooks/docker-image-build.yaml +++ b/tools/gate/playbooks/docker-image-build.yaml @@ -47,10 +47,12 @@ allow_unauthenticated: True with_items: - docker-ce - - python-pip + - python3-pip + - python3-setuptools - pip: name: docker version: 2.7.0 + executable: pip3 # NOTE(SamYaple): Allow all connections from containers to host so the # containers can access the http server for git and wheels - iptables: