From 9082283e14bf9d3e2814a100f3b40d8d329fc7c0 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Wed, 29 Mar 2023 05:37:23 +0300
Subject: [PATCH] Add Manila image

Change-Id: I80d88fc06971f4e9d72d93faf0a91449e200b4fa
---
 openstack/loci/build.sh    |  4 +++-
 zuul.d/openstack-loci.yaml | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/openstack/loci/build.sh b/openstack/loci/build.sh
index 1c4d118e..417b369c 100755
--- a/openstack/loci/build.sh
+++ b/openstack/loci/build.sh
@@ -188,6 +188,8 @@ heat_pip_packages=${heat_pip_packages:-"pycrypto"}
 heat_dist_packages=${heat_dist_packages:-"curl"}
 barbican_profiles=${barbican_profiles:-"fluent"}
 barbican_pip_packages=${barbican_pip_packages:-"pycrypto"}
+barbican_dist_packages=${barbican_dist_packages:-"'python3-dev gcc'"}
+barbican_pip_args=${barbican_pip_args:-"'--only-binary :none:'"}
 glance_profiles=${glance_profiles:-"'fluent ceph'"}
 glance_pip_packages=${glance_pip_packages:-"'pycrypto python-swiftclient'"}
 cinder_profiles=${cinder_profiles:-"'fluent lvm ceph qemu apache'"}
@@ -267,7 +269,7 @@ else
     LOCI_ARG_FROM="${BASE_IMAGE}"
 fi
 
-BUILD_PROJECTS=${BUILD_PROJECTS:-'requirements keystone heat barbican glance cinder monasca_api neutron neutron_sriov nova horizon senlin magnum ironic'}
+BUILD_PROJECTS=${BUILD_PROJECTS:-'requirements keystone heat barbican glance cinder monasca_api neutron neutron_sriov nova horizon senlin magnum ironic manila'}
 projects=( ${BUILD_PROJECTS} )
 
 pushd ${LOCI_SRC_DIR}
diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml
index bff6dc2b..7c97cb82 100644
--- a/zuul.d/openstack-loci.yaml
+++ b/zuul.d/openstack-loci.yaml
@@ -161,6 +161,8 @@
             - "PROFILES='fluent'"
             - "WHEELS='{{ wheels_location }}'"
             - "KEEP_ALL_WHEELS=yes"
+            - "DIST_PACKAGES='python3-dev gcc'"
+            - "PIP_ARGS='--only-binary :none:'"
           tags: *imagetag
         - &glance_project
           context: "."
@@ -339,6 +341,16 @@
             - "WHEELS='{{ wheels_location }}'"
             - "KEEP_ALL_WHEELS=yes"
           tags: *imagetag
+        - &manila_project
+          context: "."
+          repository: openstackhelm/manila
+          build_args:
+            - "FROM='{{ base_repository }}'"
+            - "PROJECT='manila'"
+            - "PROJECT_REF={{ branchname }}"
+            - "WHEELS='{{ wheels_location }}'"
+            - "KEEP_ALL_WHEELS=yes"
+          tags: *imagetag
     files: &loci-files
       - ^openstack/loci/.*
       - zuul.d/openstack-loci.yaml
@@ -411,6 +423,7 @@
         # - <<: *watcher_project
         - <<: *cyborg_project
         - <<: *masakari_project
+        - <<: *manila_project
 
 - job:
     name: openstack-helm-images-upload-openstack-loci-master-ubuntu_focal
@@ -466,6 +479,7 @@
         - <<: *cyborg_project
         - <<: *masakari_project
         - <<: *masakari_monitors_project
+        - <<: *manila_project
 
 - job:
     name: openstack-helm-images-upload-openstack-loci-yoga-ubuntu_focal
@@ -519,6 +533,7 @@
         - <<: *cyborg_project
         - <<: *masakari_project
         - <<: *masakari_monitors_project
+        - <<: *manila_project
 
 - job:
     name: openstack-helm-images-upload-openstack-loci-xena-ubuntu_focal
@@ -572,6 +587,7 @@
         - <<: *cyborg_project
         - <<: *masakari_project
         - <<: *masakari_monitors_project
+        - <<: *manila_project
 
 - job:
     name: openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
@@ -625,6 +641,7 @@
         - <<: *cyborg_project
         - <<: *masakari_project
         - <<: *masakari_monitors_project
+        - <<: *manila_project
 
 - job:
     name: openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal