From 017902b5ceea9b580be741cb3498188d7e7616cc Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Fri, 17 Mar 2023 17:04:36 +0000
Subject: [PATCH] [quay] Fix for docker publish in Quay

This PS adds docker python module for ansible to be able to publish
images to Quay.

Change-Id: Id599e6a7536435b18d4dbae0d618c53a35dbfb2e
---
 tools/gate/playbooks/docker-image-build.yaml | 19 +++++++++++++++----
 zuul.d/calicoctl-utility.yaml                |  4 +---
 zuul.d/ceph-utility.yaml                     |  4 +---
 zuul.d/compute-utility.yaml                  |  4 +---
 zuul.d/etcdctl-utility.yaml                  |  4 +---
 zuul.d/mysqlclient-utility.yaml              |  5 ++---
 zuul.d/openstack-utility.yaml                |  4 +---
 zuul.d/postgresql-utility.yaml               |  4 +---
 8 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml
index bc00ae2b..5b5d0bf3 100644
--- a/tools/gate/playbooks/docker-image-build.yaml
+++ b/tools/gate/playbooks/docker-image-build.yaml
@@ -13,13 +13,15 @@
 # limitations under the License.
 
 - hosts: all
+
+  roles:
+    - ensure-docker
+    - ensure-python
+    - ensure-pip
+
   tasks:
     - include_vars: vars.yaml
 
-    - name: Ensure docker
-      include_role:
-        name: ensure-docker
-
     - name: Debug inputs
       block:
         - debug:
@@ -48,6 +50,15 @@
       debug:
         var: image_tags
 
+    - name: Install Docker python module for ansible docker login
+      block:
+        - pip:
+            name: docker
+            version: 4.4.4
+            executable: pip3
+      become: True
+
+
     - name: Make images
       when: not publish
       block:
diff --git a/zuul.d/calicoctl-utility.yaml b/zuul.d/calicoctl-utility.yaml
index a7239ef2..662758a5 100644
--- a/zuul.d/calicoctl-utility.yaml
+++ b/zuul.d/calicoctl-utility.yaml
@@ -29,9 +29,7 @@
     name: airship-porthole-images-publish-calicoctl-utility
     parent: *parent
     secrets:
-      - name: quay_credentials
-        secret: quay_credentials
-        pass-to-parent: true
+      - quay_credentials
     vars:
       image_name: *image_name
       distro_suffix: *distro_suffix
diff --git a/zuul.d/ceph-utility.yaml b/zuul.d/ceph-utility.yaml
index 2e4841f8..c93d73a6 100644
--- a/zuul.d/ceph-utility.yaml
+++ b/zuul.d/ceph-utility.yaml
@@ -29,9 +29,7 @@
     name: airship-porthole-images-publish-ceph-utility
     parent: *parent
     secrets:
-      - name: quay_credentials
-        secret: quay_credentials
-        pass-to-parent: true
+      - quay_credentials
     vars:
       image_name: *image_name
       distro_suffix: *distro_suffix
diff --git a/zuul.d/compute-utility.yaml b/zuul.d/compute-utility.yaml
index 71a5c79c..a681b50c 100644
--- a/zuul.d/compute-utility.yaml
+++ b/zuul.d/compute-utility.yaml
@@ -29,9 +29,7 @@
     name: airship-porthole-images-publish-compute-utility
     parent: *parent
     secrets:
-      - name: quay_credentials
-        secret: quay_credentials
-        pass-to-parent: true
+      - quay_credentials
     vars:
       image_name: *image_name
       distro_suffix: *distro_suffix
diff --git a/zuul.d/etcdctl-utility.yaml b/zuul.d/etcdctl-utility.yaml
index 5dceddfe..df5af547 100644
--- a/zuul.d/etcdctl-utility.yaml
+++ b/zuul.d/etcdctl-utility.yaml
@@ -29,9 +29,7 @@
     name: airship-porthole-images-publish-etcdctl-utility
     parent: *parent
     secrets:
-      - name: quay_credentials
-        secret: quay_credentials
-        pass-to-parent: true
+      - quay_credentials
     vars:
       image_name: *image_name
       distro_suffix: *distro_suffix
diff --git a/zuul.d/mysqlclient-utility.yaml b/zuul.d/mysqlclient-utility.yaml
index db6d419e..402c5818 100644
--- a/zuul.d/mysqlclient-utility.yaml
+++ b/zuul.d/mysqlclient-utility.yaml
@@ -29,9 +29,7 @@
     name: airship-porthole-images-publish-mysqlclient-utility
     parent: *parent
     secrets:
-      - name: quay_credentials
-        secret: quay_credentials
-        pass-to-parent: true
+      - quay_credentials
     vars:
       image_name: *image_name
       distro_suffix: *distro_suffix
@@ -39,3 +37,4 @@
       tags:
         dynamic:
           commit: true
+
diff --git a/zuul.d/openstack-utility.yaml b/zuul.d/openstack-utility.yaml
index 9d9bea76..967c9a6f 100644
--- a/zuul.d/openstack-utility.yaml
+++ b/zuul.d/openstack-utility.yaml
@@ -29,9 +29,7 @@
     name: airship-porthole-images-publish-openstack-utility
     parent: *parent
     secrets:
-      - name: quay_credentials
-        secret: quay_credentials
-        pass-to-parent: true
+      - quay_credentials
     vars:
       image_name: *image_name
       distro_suffix: *distro_suffix
diff --git a/zuul.d/postgresql-utility.yaml b/zuul.d/postgresql-utility.yaml
index 7d5aa806..11d70af6 100644
--- a/zuul.d/postgresql-utility.yaml
+++ b/zuul.d/postgresql-utility.yaml
@@ -29,9 +29,7 @@
     name: airship-porthole-images-publish-postgresql-utility
     parent: *parent
     secrets:
-      - name: quay_credentials
-        secret: quay_credentials
-        pass-to-parent: true
+      - quay_credentials
     vars:
       image_name: *image_name
       distro_suffix: *distro_suffix