From c3bdd8a3a40ae09bbd76a93b4718f0f8a96790fc Mon Sep 17 00:00:00 2001 From: Lucas de Ataides Date: Tue, 22 Aug 2023 14:58:58 -0300 Subject: [PATCH] Uncomment Openstack Debian packages and images With the new STX-Openstack manifest [1], we can now uncomment the packages in this repository so they can be build. These were previously commented as they're also present on [2] and having duplicate packages would cause the build to fail, or grab the incorrect packages. This change also updates the build layer for this repo to the openstack layer, that is being created by [3] Note that since this change is on the `f/antelope` branch, it will not impact the default manifest, nor the default StarlingX build. [1] https://review.opendev.org/c/starlingx/manifest/+/891875 [2] https://opendev.org/starlingx/upstream/src/branch/master/debian_pkg_dirs [3] https://review.opendev.org/c/starlingx/tools/+/892166 Test Plan: PASS: Build all packages from this repository PASS: Build all images from this repository Depends-On: https://review.opendev.org/c/starlingx/manifest/+/893244 Depends-On: https://review.opendev.org/c/starlingx/manifest/+/893245 Story: 2010797 Task: 48691 Change-Id: I24677513f42f92258162ea09fe7e6c11b52093a1 Signed-off-by: Lucas de Ataides (cherry picked from commit fb512b9c60cc1459d3bcdaedae9854d4cc73fcdb) --- debian_build_layer.cfg | 2 +- debian_pkg_dirs | 24 ++++++++++++------------ debian_stable_docker_images.inc | 27 ++++++++++++++------------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/debian_build_layer.cfg b/debian_build_layer.cfg index c581999f..91705c06 100644 --- a/debian_build_layer.cfg +++ b/debian_build_layer.cfg @@ -1 +1 @@ -flock +openstack diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 27da060e..838c12f8 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -2,15 +2,15 @@ openstack-helm openstack-helm-infra python3-k8sapp-openstack stx-openstack-helm-fluxcd -#upstream/openstack/openstack-pkg-tools -#upstream/openstack/python-aodhclient -#upstream/openstack/python-barbicanclient -#upstream/openstack/python-cinderclient -#upstream/openstack/python-glanceclient -#upstream/openstack/python-heatclient -#upstream/openstack/python-ironicclient -#upstream/openstack/python-keystoneclient -#upstream/openstack/python-neutronclient -#upstream/openstack/python-novaclient -#upstream/openstack/python-openstackclient -#upstream/openstack/python-openstacksdk \ No newline at end of file +upstream/openstack/openstack-pkg-tools +upstream/openstack/python-aodhclient +upstream/openstack/python-barbicanclient +upstream/openstack/python-cinderclient +upstream/openstack/python-glanceclient +upstream/openstack/python-heatclient +upstream/openstack/python-ironicclient +upstream/openstack/python-keystoneclient +upstream/openstack/python-neutronclient +upstream/openstack/python-novaclient +upstream/openstack/python-openstackclient +upstream/openstack/python-openstacksdk diff --git a/debian_stable_docker_images.inc b/debian_stable_docker_images.inc index d4bb0526..3f6261da 100644 --- a/debian_stable_docker_images.inc +++ b/debian_stable_docker_images.inc @@ -1,13 +1,14 @@ -#upstream/openstack/openstack-aodh -#upstream/openstack/openstack-ironic -#upstream/openstack/python-barbican -#upstream/openstack/python-ceilometer -#upstream/openstack/python-cinder -#upstream/openstack/python-glance -#upstream/openstack/python-heat/openstack-heat -#upstream/openstack/python-horizon -#upstream/openstack/python-keystone -#upstream/openstack/python-neutron -#upstream/openstack/python-nova -#upstream/openstack/python-openstackclient -#upstream/openstack/python-placement +upstream/openstack/openstack-aodh +upstream/openstack/openstack-ironic +upstream/openstack/python-barbican +upstream/openstack/python-ceilometer +upstream/openstack/python-cinder +upstream/openstack/python-glance +upstream/openstack/python-heat/openstack-heat +upstream/openstack/python-horizon +upstream/openstack/python-keystone +upstream/openstack/python-neutron +upstream/openstack/python-nova +upstream/openstack/python-openstackclient +upstream/openstack/python-placement +