Publish reproducer containers on quay.io as well

Change-Id: Ib9ea1494e2b3ef4f2bd22f6a4dccbb4b58985fca
rdo-infra · Jan 6, 2022 · 6372330 · 6372330
1 parent e783fdd
commit 6372330
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 22 deletions.
diff --git a/roles/update-reproducer-zuul-images/defaults/main.yml b/roles/update-reproducer-zuul-images/defaults/main.yml
@@ -1,5 +1,9 @@
 ---
-registry_server: docker.io
+registry_server:
+  - server: docker.io
+    serv_secret: "{{ dockerio_rdoci }}"
+  - server: quay.io
+    serv_secret: "{{ quay_rdoci }}"
 container_namespace: rdoci
 original_namespace: zuul
 original_tag: latest

diff --git a/roles/update-reproducer-zuul-images/molecule/default/converge.yml b/roles/update-reproducer-zuul-images/molecule/default/converge.yml
@@ -9,3 +9,5 @@
         tasks_from: retag
       vars:
         container_command: echo
+        reg:
+          server: docker.io
diff --git a/roles/update-reproducer-zuul-images/tasks/login.yml b/roles/update-reproducer-zuul-images/tasks/login.yml
@@ -1,21 +1,22 @@
 ---
 - name: Login to registry
   command: >-
-    {{ container_command }} login {{ registry_server }}
-    --username  {{ dockerio_rdoci.user }} --password "$PSSW"
+    {{ container_command }} login {{ item.server }}
+    --username  {{ item.serv_secret.user }} --password "$PSSW"
   changed_when: true
   environment:
-    PSSW: "{{ dockerio_rdoci.password }}"
+    PSSW: "{{ item.serv_secret.password }}"
   no_log: true
+  loop: "{{ registry_server }}"
 
-- when: container_command == 'podman'
-  block:
-    - name: Check if login succeded
-      command: >-
-        {{ container_command }} login {{ registry_server }} --get-login
-      changed_when: false
-      register: login_
+- name: Check if login succeded
+  command: >-
+    {{ container_command }} login {{ item.server }} --get-login
+  changed_when: false
+  register: login_
+  loop: "{{ registry_server }}"
 
-    - name: Print if logged in
-      debug:
-        msg: "Logged in as '{{ login_.stdout }}'"
+- name: Print if logged in
+  debug:
+    msg: "Logged in as '{{ item.stdout }}'"
+  loop: "{{ login_.results }}"
diff --git a/roles/update-reproducer-zuul-images/tasks/main.yml b/roles/update-reproducer-zuul-images/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
 - include_tasks: login.yml
 - include_tasks: retag.yml
+  loop: "{{ registry_server }}"
+  loop_control:
+    loop_var: reg
 - include_tasks: push.yml
+  loop: "{{ registry_server }}"
+  loop_control:
+    loop_var: reg
diff --git a/roles/update-reproducer-zuul-images/tasks/push.yml b/roles/update-reproducer-zuul-images/tasks/push.yml
@@ -2,16 +2,16 @@
 - name: Print pushing location
   debug:
     msg: >-
-      Pushing containers to {{ registry_server }}/{{ container_namespace }}/container:{{ push_tag }}
+      Pushing containers to {{ reg.server }}/{{ container_namespace }}/container:{{ push_tag }}
 
 - name: Push to registry
   command: >-
-    {{ container_command }} push {{ registry_server }}/{{ container_namespace }}/{{ item }}:{{ push_tag }}
+    {{ container_command }} push {{ reg.server }}/{{ container_namespace }}/{{ item }}:{{ push_tag }}
   changed_when: true
   loop: "{{ containers }}"
 
 - name: Logout of registry
   no_log: true
   command: >-
-    {{ container_command }} logout {{ registry_server }}
+    {{ container_command }} logout {{ reg.server }}
   changed_when: true
diff --git a/roles/update-reproducer-zuul-images/tasks/retag.yml b/roles/update-reproducer-zuul-images/tasks/retag.yml
@@ -8,17 +8,17 @@
 - name: Print pulling location
   debug:
     msg: >-
-      Pulling containers from {{ registry_server }}/{{ original_namespace }}/container:{{ original_tag }}
+      Pulling containers from {{ reg.server }}/{{ original_namespace }}/container:{{ original_tag }}
 
-- name: Download from registry
+- name: Download from registry {{ reg.server }}
   command: >-
-    {{ container_command }} pull {{ registry_server }}/{{ original_namespace }}/{{ item }}:{{ original_tag }}
+    {{ container_command }} pull {{ reg.server }}/{{ original_namespace }}/{{ item }}:{{ original_tag }}
   changed_when: true
   loop: "{{ containers }}"
 
 - name: Retag containers
   command: >-
-    {{ container_command }} tag {{ registry_server }}/{{ original_namespace }}/{{ item }}:{{ original_tag }}
-    {{ registry_server }}/{{ container_namespace }}/{{ item }}:{{ push_tag }}
+    {{ container_command }} tag {{ reg.server }}/{{ original_namespace }}/{{ item }}:{{ original_tag }}
+    {{ reg.server }}/{{ container_namespace }}/{{ item }}:{{ push_tag }}
   changed_when: true
   loop: "{{ containers }}"
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
@@ -785,3 +785,19 @@
           5/YHlqKyj2fv9ff+F1JFBVZqnTNJlc0C3lEf9G3IoWuyGST/Wbj4KJrDlkAh/lRMFOsUl
           ujMX5+w6uEFIKs9yXaw9SaKPwXdLe/u0lLwQ3KAUeeK4vIl0xH6gL7CnJ/fFqJBI3q+ME
           J33jJN8k9tLD+IlMg6jnNIQzeJAnNvnKKcRNceUS0ug3m68F8bPgLqgsn7WbQk=
+
+- secret:
+    name: quay_rdoci
+    data:
+      user: "rdoci+rdocirobot"
+      password: !encrypted/pkcs1-oaep
+        - qxu4ehnUymkdIwY5eQRfXi47vxkPjBsqxkmmpo8qPk7E3ffS+GKz5bwXWQC4yiN4yzYbX
+          6vKLKYgxu/9W0YYxzcF5h2Vl/O2OwcWm2wlvW8NtOdzmDZxv8Uiw2S4XDbhEWhwR4/YJ6
+          iemRMbKzj8/YzAO67roz2wUQhsgkPf6NjldNg8E5M3/Iq+hIFXagt2kp2qYX77oLoU3Sv
+          Yh+xginbfGkzeQEOSWI+pshalxHi6RTtq8WraCxhxAm9MVOTuJWAwWlja6X9xtz77a2a0
+          12+Uvlt2dtia+xEW/qf0SzjAP1R9c9Hiw/x5Zs5FqJBJrXHAtR+BQ9ofge42jP/tSGl5K
+          NDmMzRb8jsI8CzH0x21XGcrFwjvf9boHwtsDvfKATNoaYNw7MEjkAIdgS0uGZ3/PEWVn7
+          F92TiMN137kpwD1XL0uFVzKURQT9gk2Wto94am3hJb0dfVRydfYsYA+KbnCTmXPTeS5C8
+          tLOlFDB1a9qcFAGbKYpLEh9bXTEEa3fQzCOuYbeNZ1SLdBhWdA7X+EIhOPTr3gYDN7VNQ
+          fhK7Xso+aHuikpx9Wr72OnYrm8e+/tkTiJ+qNbSImogGePKvzm9fphnnjFqpXEB9Hpg0L
+          eZ7t1CWJMUsX8/5nDSElIrrDjzR0yc2Kq9IBe/XdxTXnEmdFDTsyD3ui3DSDcg=
diff --git a/zuul.d/tripleoci.yaml b/zuul.d/tripleoci.yaml
@@ -365,6 +365,7 @@
     run: playbooks/tripleo-ci-reproducer-base/promotion-run.yaml
     secrets:
       - dockerio_rdoci
+      - quay_rdoci
 
 
 # --- CentOS 8 new container build job ---