From 885f02e21712e2b12505abde88012e18b4cacb82 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Wed, 27 Feb 2019 11:08:44 -0800
Subject: [PATCH] Handle multiple docker images with the same repository

So that users can specify two docker image builds for the same
repository, but with different tags, ensure that the temporary
change_ tag attached to the image also includes the final tag
name.

This allows this configuration to work:

docker_images:
  - repository: foo/image
    context: opensuse
    tags:
      - opensuse-latest
  - repository: foo/image
    context: ubuntu
    tags:
      - ubuntu-latest

Change-Id: I917dcf8a74fc864ea06dc70bdb3e212dc170eb48
---
 roles/build-docker-image/tasks/main.yaml      |  2 +-
 .../tasks/promote-retag-inner.yaml            | 28 ++++++++++++++++
 .../tasks/promote-retag.yaml                  | 32 ++-----------------
 roles/upload-docker-image/tasks/main.yaml     |  6 ++--
 roles/upload-docker-image/tasks/push.yaml     |  5 +++
 5 files changed, 41 insertions(+), 32 deletions(-)
 create mode 100644 roles/promote-docker-image/tasks/promote-retag-inner.yaml
 create mode 100644 roles/upload-docker-image/tasks/push.yaml

diff --git a/roles/build-docker-image/tasks/main.yaml b/roles/build-docker-image/tasks/main.yaml
index 73156e159..4a09643f0 100644
--- a/roles/build-docker-image/tasks/main.yaml
+++ b/roles/build-docker-image/tasks/main.yaml
@@ -13,8 +13,8 @@
     {% for build_arg in item.build_args | default([]) -%}
       --build-arg {{ build_arg }}
     {% endfor -%}
-    --tag {{ item.repository }}:change_{{ zuul.change }}
     {% for tag in item.tags | default(['latest']) -%}
+    --tag {{ item.repository }}:change_{{ zuul.change }}_{{ tag }}
     --tag {{ item.repository }}:{{ tag }}
     {% endfor -%}
   args:
diff --git a/roles/promote-docker-image/tasks/promote-retag-inner.yaml b/roles/promote-docker-image/tasks/promote-retag-inner.yaml
new file mode 100644
index 000000000..5643fe2fb
--- /dev/null
+++ b/roles/promote-docker-image/tasks/promote-retag-inner.yaml
@@ -0,0 +1,28 @@
+- name: Get manifest
+  no_log: true
+  uri:
+    url: "https://registry.hub.docker.com/v2/{{ image.repository }}/manifests/change_{{ zuul.change }}_{{ image_tag }}"
+    status_code: 200
+    headers:
+      Accept: "application/vnd.docker.distribution.manifestv2+json"
+      Authorization: "Bearer {{ token.json.token }}"
+    return_content: true
+  register: manifest
+- name: Put manifest
+  no_log: true
+  uri:
+    url: "https://registry.hub.docker.com/v2/{{ image.repository }}/manifests/{{ image_tag }}"
+    method: PUT
+    status_code: 201
+    body: "{{ manifest.content | string }}"
+    headers:
+      Content-Type: "application/vnd.docker.distribution.manifestv2+json"
+      Authorization: "Bearer {{ token.json.token }}"
+- name: Delete the current change tag
+  no_log: true
+  uri:
+    url: "https://hub.docker.com/v2/repositories/{{ image.repository }}/tags/change_{{ zuul.change }}_{{ image_tag }}/"
+    method: DELETE
+    status_code: 204
+    headers:
+      Authorization: "JWT {{ jwt_token.json.token }}"
diff --git a/roles/promote-docker-image/tasks/promote-retag.yaml b/roles/promote-docker-image/tasks/promote-retag.yaml
index 255e4bd4a..8237dab4c 100644
--- a/roles/promote-docker-image/tasks/promote-retag.yaml
+++ b/roles/promote-docker-image/tasks/promote-retag.yaml
@@ -6,34 +6,8 @@
     password: "{{ docker_credentials.password }}"
     force_basic_auth: true
   register: token
-- name: Get manifest
-  no_log: true
-  uri:
-    url: "https://registry.hub.docker.com/v2/{{ image.repository }}/manifests/change_{{ zuul.change }}"
-    status_code: 200
-    headers:
-      Accept: "application/vnd.docker.distribution.manifestv2+json"
-      Authorization: "Bearer {{ token.json.token }}"
-    return_content: true
-  register: manifest
-- name: "Put manifest"
-  no_log: true
+- name: Retag image
   loop: "{{ image.tags | default(['latest']) }}"
   loop_control:
-    loop_var: new_tag
-  uri:
-    url: "https://registry.hub.docker.com/v2/{{ image.repository }}/manifests/{{ new_tag }}"
-    method: PUT
-    status_code: 201
-    body: "{{ manifest.content | string }}"
-    headers:
-      Content-Type: "application/vnd.docker.distribution.manifestv2+json"
-      Authorization: "Bearer {{ token.json.token }}"
-- name: Delete the current change tag
-  no_log: true
-  uri:
-    url: "https://hub.docker.com/v2/repositories/{{ image.repository }}/tags/change_{{ zuul.change }}/"
-    method: DELETE
-    status_code: 204
-    headers:
-      Authorization: "JWT {{ jwt_token.json.token }}"
+    loop_var: image_tag
+  include_tasks: promote-retag-inner.yaml
diff --git a/roles/upload-docker-image/tasks/main.yaml b/roles/upload-docker-image/tasks/main.yaml
index d7e8c81ee..15490903d 100644
--- a/roles/upload-docker-image/tasks/main.yaml
+++ b/roles/upload-docker-image/tasks/main.yaml
@@ -8,6 +8,8 @@
 - name: Log in to dockerhub
   command: "docker login -u {{ docker_credentials.username }} -p {{ docker_credentials.password }}"
   no_log: true
-- name: Upload to dockerhub
-  command: "docker push {{ item.repository }}:change_{{ zuul.change }}"
+- name: Upload image to dockerhub
   loop: "{{ docker_images }}"
+  loop_control:
+    loop_var: image
+  include_tasks: push.yaml
diff --git a/roles/upload-docker-image/tasks/push.yaml b/roles/upload-docker-image/tasks/push.yaml
new file mode 100644
index 000000000..28f54e4ef
--- /dev/null
+++ b/roles/upload-docker-image/tasks/push.yaml
@@ -0,0 +1,5 @@
+- name: Upload tag to dockerhub
+  command: "docker push {{ item.repository }}:change_{{ zuul.change }}_{{ image_tag }}"
+  loop: "{{ image.tags | default(['latest']) }}"
+  loop_control:
+    loop_var: image_tag