From 67c274141ac494d5d4eaf46d438190d9ffd56e7f Mon Sep 17 00:00:00 2001 From: Luan Nunes Utimura Date: Tue, 9 May 2023 19:16:03 -0300 Subject: [PATCH] stx-openstack: Use commit hash in PROJECT_REF As the `stable/ussuri` branch is potentially being removed from all OpenStack repositories -- as seen in `openstack/heat` [1] -- we should consider using a different `PROJECT_REF` for all LOCI-based container images in stx-openstack to avoid possible build breaks in the future. This change proposes the use of the following commit SHAs: Repository stable/ussuri's HEAD (as of May 9th) * openstack/aodh 4366d6eae1aad4e15aeca4bc7e8b5e757c7601e8 * openstack/ironic 859e51c8b4b8344827b5bba1f9a0b737ffbc1ebc * openstack/barbican cc076f24e55c24a6fc8e57ca606130090fb6369b * openstack/ceilometer bcada72c3aaeeb2a86de3368b1787a9253c9d55b * openstack/cinder 79b012fbc8b6bc9dcce2c8c52a6fa63976a0309f * openstack/glance 6f03ccd47772e02f810de8fa3158afddc4a9c158 * openstack/horizon e6f3952b878d6b04fde9742987e0f37a1cfad3e5 * openstack/keystone 1ab860a08e527ca9e0c82a49fbf004d415fec991 * openstack/neutron fe2445d99c430bb080ac45a19e4958b1ae7c9857 * openstack/nova 3fe8880d3759cbd7b19d75dcf235dfd5c511be13 * openstack/placement 5a865abc2545544870ad972f70cd54ebd14c19a8 Note: Gnocchi is in [2] and currently points to a specific semver. [1] https://opendev.org/openstack/heat [2] https://github.com/gnocchixyz/gnocchi Test Plan: PASS - Build stx-debian base image PASS - Build wheels tarball PASS - Build all the stx-openstack images affected by this change Partial-Bug: 2019015 Change-Id: Ibf589444237664dd9e4ab8314ca1c8ad44f80ec7 Signed-off-by: Luan Nunes Utimura --- openstack/openstack-aodh/debian/stx-aodh.stable_docker_image | 2 +- .../openstack-ironic/debian/stx-ironic.stable_docker_image | 2 +- .../python-barbican/debian/stx-barbican.stable_docker_image | 2 +- .../python-ceilometer/debian/stx-ceilometer.stable_docker_image | 2 +- openstack/python-cinder/debian/stx-cinder.stable_docker_image | 2 +- openstack/python-glance/debian/stx-glance.stable_docker_image | 2 +- openstack/python-horizon/debian/stx-horizon.stable_docker_image | 2 +- .../python-keystone/debian/stx-keystone.stable_docker_image | 2 +- openstack/python-neutron/debian/stx-neutron.stable_docker_image | 2 +- openstack/python-nova/debian/stx-nova.stable_docker_image | 2 +- .../python-placement/debian/stx-placement.stable_docker_image | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openstack/openstack-aodh/debian/stx-aodh.stable_docker_image b/openstack/openstack-aodh/debian/stx-aodh.stable_docker_image index 4b341162..ba7dbbc7 100644 --- a/openstack/openstack-aodh/debian/stx-aodh.stable_docker_image +++ b/openstack/openstack-aodh/debian/stx-aodh.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-aodh PROJECT=aodh PROJECT_REPO=https://opendev.org/openstack/aodh.git -PROJECT_REF=stable/ussuri +PROJECT_REF=4366d6eae1aad4e15aeca4bc7e8b5e757c7601e8 PROJECT_UID=42425 PROJECT_GID=42425 PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient" diff --git a/openstack/openstack-ironic/debian/stx-ironic.stable_docker_image b/openstack/openstack-ironic/debian/stx-ironic.stable_docker_image index 46628d60..f40f4292 100644 --- a/openstack/openstack-ironic/debian/stx-ironic.stable_docker_image +++ b/openstack/openstack-ironic/debian/stx-ironic.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-ironic PROJECT=ironic PROJECT_REPO=https://opendev.org/openstack/ironic.git -PROJECT_REF=stable/ussuri +PROJECT_REF=859e51c8b4b8344827b5bba1f9a0b737ffbc1ebc PROJECT_UID=42425 PROJECT_GID=42425 PIP_PACKAGES="pylint alembic pysnmp" diff --git a/openstack/python-barbican/debian/stx-barbican.stable_docker_image b/openstack/python-barbican/debian/stx-barbican.stable_docker_image index e3f0ed1a..2b8807f3 100644 --- a/openstack/python-barbican/debian/stx-barbican.stable_docker_image +++ b/openstack/python-barbican/debian/stx-barbican.stable_docker_image @@ -4,6 +4,6 @@ PROJECT=barbican DIST_REPOS="OS" PROJECT_REPO=https://opendev.org/openstack/barbican.git NON_UNIQUE_SYSTEM_ACCOUNT="yes" -PROJECT_REF=stable/ussuri +PROJECT_REF=cc076f24e55c24a6fc8e57ca606130090fb6369b PIP_PACKAGES="pycryptodomex" PROFILES="fluent" diff --git a/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image b/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image index b9620a33..e7a27575 100644 --- a/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image +++ b/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-ceilometer PROJECT=ceilometer PROJECT_REPO=https://opendev.org/openstack/ceilometer.git -PROJECT_REF=stable/ussuri +PROJECT_REF=bcada72c3aaeeb2a86de3368b1787a9253c9d55b PIP_PACKAGES="\ gnocchiclient \ libvirt-python \ diff --git a/openstack/python-cinder/debian/stx-cinder.stable_docker_image b/openstack/python-cinder/debian/stx-cinder.stable_docker_image index dc65611e..83a9bb04 100644 --- a/openstack/python-cinder/debian/stx-cinder.stable_docker_image +++ b/openstack/python-cinder/debian/stx-cinder.stable_docker_image @@ -3,7 +3,7 @@ LABEL=stx-cinder PROJECT=cinder DIST_REPOS="OS" PROJECT_REPO=https://opendev.org/openstack/cinder.git -PROJECT_REF=stable/ussuri +PROJECT_REF=79b012fbc8b6bc9dcce2c8c52a6fa63976a0309f PROJECT_UID=42425 PROJECT_GID=42425 NON_UNIQUE_SYSTEM_ACCOUNT="yes" diff --git a/openstack/python-glance/debian/stx-glance.stable_docker_image b/openstack/python-glance/debian/stx-glance.stable_docker_image index 45a1b78c..5c189511 100644 --- a/openstack/python-glance/debian/stx-glance.stable_docker_image +++ b/openstack/python-glance/debian/stx-glance.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-glance PROJECT=glance PROJECT_REPO=https://opendev.org/openstack/glance.git -PROJECT_REF=stable/ussuri +PROJECT_REF=6f03ccd47772e02f810de8fa3158afddc4a9c158 DIST_REPOS="OS" UPDATE_SYSTEM_ACCOUNT="yes" NON_UNIQUE_SYSTEM_ACCOUNT="yes" diff --git a/openstack/python-horizon/debian/stx-horizon.stable_docker_image b/openstack/python-horizon/debian/stx-horizon.stable_docker_image index 9f5d0c6c..e55c6418 100644 --- a/openstack/python-horizon/debian/stx-horizon.stable_docker_image +++ b/openstack/python-horizon/debian/stx-horizon.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-horizon PROJECT=horizon PROJECT_REPO=https://opendev.org/openstack/horizon.git -PROJECT_REF=stable/ussuri +PROJECT_REF=e6f3952b878d6b04fde9742987e0f37a1cfad3e5 PROJECT_UID=42425 PROJECT_GID=42425 PIP_PACKAGES="pycryptodomex python-ceilometerclient \ diff --git a/openstack/python-keystone/debian/stx-keystone.stable_docker_image b/openstack/python-keystone/debian/stx-keystone.stable_docker_image index 504a986f..b898db29 100644 --- a/openstack/python-keystone/debian/stx-keystone.stable_docker_image +++ b/openstack/python-keystone/debian/stx-keystone.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-keystone PROJECT=keystone PROJECT_REPO=https://opendev.org/openstack/keystone.git -PROJECT_REF=stable/ussuri +PROJECT_REF=1ab860a08e527ca9e0c82a49fbf004d415fec991 PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint" DIST_REPOS="OS" PROFILES="fluent apache" diff --git a/openstack/python-neutron/debian/stx-neutron.stable_docker_image b/openstack/python-neutron/debian/stx-neutron.stable_docker_image index dbac5e00..3b147c99 100644 --- a/openstack/python-neutron/debian/stx-neutron.stable_docker_image +++ b/openstack/python-neutron/debian/stx-neutron.stable_docker_image @@ -3,7 +3,7 @@ LABEL=stx-neutron PROJECT=neutron DIST_REPOS="OS" PROJECT_REPO=https://opendev.org/openstack/neutron.git -PROJECT_REF=stable/ussuri +PROJECT_REF=fe2445d99c430bb080ac45a19e4958b1ae7c9857 UPDATE_SYSTEM_ACCOUNT="yes" NON_UNIQUE_SYSTEM_ACCOUNT="yes" PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml" diff --git a/openstack/python-nova/debian/stx-nova.stable_docker_image b/openstack/python-nova/debian/stx-nova.stable_docker_image index f44c8926..8452e8ed 100644 --- a/openstack/python-nova/debian/stx-nova.stable_docker_image +++ b/openstack/python-nova/debian/stx-nova.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-nova PROJECT=nova PROJECT_REPO=https://opendev.org/openstack/nova.git -PROJECT_REF=stable/ussuri +PROJECT_REF=3fe8880d3759cbd7b19d75dcf235dfd5c511be13 PIP_PACKAGES="\ httplib2 \ pycryptodomex \ diff --git a/openstack/python-placement/debian/stx-placement.stable_docker_image b/openstack/python-placement/debian/stx-placement.stable_docker_image index 5f15eec1..043f209f 100644 --- a/openstack/python-placement/debian/stx-placement.stable_docker_image +++ b/openstack/python-placement/debian/stx-placement.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-placement PROJECT=placement PROJECT_REPO=https://opendev.org/openstack/placement.git -PROJECT_REF=stable/ussuri +PROJECT_REF=5a865abc2545544870ad972f70cd54ebd14c19a8 PROJECT_UID=42425 PROJECT_GID=42425 PIP_PACKAGES="pycryptodomex httplib2"