From e3b2bf84cc90f125eb8434a1abb5797d22816bc1 Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Thu, 6 Aug 2020 14:19:33 -0500
Subject: [PATCH] Publish loci requirements image

It's handy to have a requirements image for each release/distro
used in OSH for development purposes.

Depends-On: https://review.opendev.org/744271
Change-Id: I7e6ec0ac10d4ba562b11f742aad7874f3e7b1a02
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
---
 zuul.d/openstack-loci.yaml | 47 ++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml
index a5d34476..a491b296 100644
--- a/zuul.d/openstack-loci.yaml
+++ b/zuul.d/openstack-loci.yaml
@@ -114,7 +114,7 @@
             - "CEPH_REPO='{{ ceph_repo }}'"
             - "CEPH_KEY='{{ ceph_key }}'"
       prep_docker_images:
-        - &requirements_project
+        - &prep_requirements_project
           context: "."
           repository: openstackhelm/requirements
           build_args:
@@ -123,6 +123,11 @@
             - "PROJECT='requirements'"
             - "PROJECT_REF={{ branchname }}"
       docker_images: &project_images
+        - &requirements_project
+          <<: *prep_requirements_project
+          tags: &imagetag
+            - "{{ shortbranchname }}-{{ distroname }}"
+            - "{{ shortbranchname }}-{{ distroname }}-{{ currentdate }}" # Frozen tag
         - &keystone_project
           context: "."
           repository: openstackhelm/keystone
@@ -134,9 +139,7 @@
             - "PROFILES='fluent apache ldap {{ shortbranchname }}'"
             - "PIP_PACKAGES='python-openstackclient'"
             - "WHEELS='{{ wheels_location }}'"
-          tags: &imagetag
-            - "{{ shortbranchname }}-{{ distroname }}"
-            - "{{ shortbranchname }}-{{ distroname }}-{{ currentdate }}" # Frozen tag
+          tags: *imagetag
         - &heat_project
           context: "."
           repository: openstackhelm/heat
@@ -330,8 +333,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -378,8 +382,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -425,8 +430,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -489,8 +495,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -555,8 +562,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -597,8 +605,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -649,8 +658,9 @@
             - "FROM=opensuse/leap:15.0"
           tags:
             - "{{ distroname }}"
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -695,8 +705,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -740,8 +751,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - <<: *requirements_project
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - <<: *keystone_project
         - <<: *glance_project
         - <<: *cinder_project
@@ -786,14 +798,9 @@
       base_docker_image:
         - <<: *base_image
       prep_docker_images:
-        - context: "."
-          repository: openstackhelm/requirements
-          build_args:
-            - "FROM='{{ base_repository }}'"
-            - "PYTHON3={{ python3 }}"
-            - "PROJECT='requirements'"
-            - "PROJECT_REF={{ branchname }}"
+        - <<: *prep_requirements_project
       docker_images:
+        - <<: *requirements_project
         - context: "."
           repository: openstackhelm/keystone
           build_args: