From 3a27007e8a120b9cc439a6fd09f09fb3431ab211 Mon Sep 17 00:00:00 2001
From: "anthony.bellino" <ab2434@att.com>
Date: Fri, 10 Sep 2021 12:56:54 -0700
Subject: [PATCH] (zuul) Fix Shipyard Post Gates

Change-Id: I9f6f633399069f28c47c381faf4230e4f22276e2
---
 .../gate/roles/build-images/tasks/airship-shipyard.yaml  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/gate/roles/build-images/tasks/airship-shipyard.yaml b/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
index aad72e20..100b44ab 100644
--- a/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
+++ b/tools/gate/roles/build-images/tasks/airship-shipyard.yaml
@@ -26,7 +26,7 @@
         msg: "{{ tags | to_json }}"
 
 - name: Determine tags
-  shell: echo '{{ tags | to_json }}' | python {{ zuul.project.src_dir }}/tools/image_tags.py
+  shell: echo '{{ tags | to_json }}' | python3 {{ zuul.project.src_dir }}/tools/image_tags.py
   environment:
     BRANCH: "{{ zuul.branch | default('') }}"
     CHANGE: "{{ zuul.change | default('') }}"
@@ -70,6 +70,11 @@
       with_items:
         - docker-ce
         - 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:
@@ -100,8 +105,6 @@
 
 - name: Publish images
   block:
-    - pip:
-        name: docker-py
     - docker_login:
         username: "{{ airship_shipyard_quay_creds.username }}"
         password: "{{ airship_shipyard_quay_creds.password }}"