Merge "[CI] Publish images to quay.io on a daily basis"

2 files changed, 29 insertions, 11 deletions

diff --git a/tests/playbooks/publish.yml b/tests/playbooks/publish.yml
index 1149408fe..6c688b664 100644
--- a/tests/playbooks/publish.yml
+++ b/tests/playbooks/publish.yml
@@ -11,16 +11,34 @@
       docker_host_info:
         images: yes
         images_filters:
-          reference: "kolla/*"
+          reference: "{{ kolla_namespace }}/*"
       register: docker_host_info
 
-    - name: Login to Dockerhub
-      docker_login:
-        username: "{{ kolla_dockerhub_creds.user | trim }}"
-        password: "{{ kolla_dockerhub_creds.password | trim }}"
+    - block:
+        - name: Login to Dockerhub
+          docker_login:
+            username: "{{ kolla_dockerhub_creds.user | trim }}"
+            password: "{{ kolla_dockerhub_creds.password | trim }}"
 
-    - name: Push built container images
-      docker_image:
-        name: "{{ item.RepoTags.0 }}"
-        push: yes
-      loop: "{{ docker_host_info.images }}"
+        - name: Push built container images
+          docker_image:
+            name: "{{ item.RepoTags.0 }}"
+            push: yes
+          loop: "{{ docker_host_info.images }}"
+      when: kolla_registry == 'dockerhub'
+
+    - block:
+        - name: Login to quay.io
+          docker_login:
+            registry: quay.io
+            username: "{{ kolla_quay_io_creds.username | trim }}"
+            password: "{{ kolla_quay_io_creds.password | trim }}"
+
+        - name: Push built container images
+          docker_image:
+            name: "{{ item.RepoTags.0 }}"
+            push: yes
+            repository: "quay.io/{{ item.RepoTags.0 }}"
+            source: local
+          loop: "{{ docker_host_info.images }}"
+      when: kolla_registry == 'quay.io'
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index 3407aa6e8..092464c0f 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -31,7 +31,7 @@
       vars:
         kolla_publisher_config:
           DEFAULT:
-            namespace: kolla
+            namespace: "{{ kolla_namespace }}"
             tag: "{{ (zuul.tag if zuul.pipeline == 'release' else zuul.branch | basename) ~ tag_suffix }}"
       set_fact:
         kolla_build_config: "{{ kolla_build_config | combine(kolla_publisher_config, recursive=True) }}"