From 5d1f133a19ebee4729c11650bc79d242b5db411b Mon Sep 17 00:00:00 2001 From: Luan Nunes Utimura Date: Tue, 9 May 2023 16:08:45 -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/heat 5466ede853bde7d636943cba017ed8265dcfd260 * 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 General cherry-pick notes: -------------------------- Originally, this update was made through two commits (on `master`): 1) 7243a51 - stx-heat: Use commit hash in PROJECT_REF: This commit changed the `PROJECT_REF` only for `stx-heat`, which, at the time, was the image responsible for breaking the `stx-openstack` build. 2) 67c2741 - stx-openstack: Use commit hash in PROJECT_REF: This commit did the same thing as 1) but for all other `stx-openstack` images, for prevention purposes. Since the two are strongly related, this cherry-pick combines them into a single change that effectively updates all the `stx-openstack` images at once. `r/stx.7.0` cherry-pick notes: ------------------------------ As this release has images based on CentOS, the original changes had to be adapted to change the files corresponding to that OS. Partial-Bug: 2019015 Change-Id: Ibf589444237664dd9e4ab8314ca1c8ad44f80ec7 Signed-off-by: Luan Nunes Utimura (cherry picked from commit 67c274141ac494d5d4eaf46d438190d9ffd56e7f) (cherry picked from commit 7243a5140f8b8989099ad70f8c63a3507eab5c2e) --- openstack/openstack-aodh/centos/stx-aodh.stable_docker_image | 2 +- .../openstack-ironic/centos/stx-ironic.stable_docker_image | 2 +- .../python-barbican/centos/stx-barbican.stable_docker_image | 2 +- .../centos/stx-ceilometer.stable_docker_image | 2 +- openstack/python-cinder/centos/stx-cinder.stable_docker_image | 2 +- openstack/python-glance/centos/stx-glance.stable_docker_image | 2 +- .../openstack-heat/centos/stx-heat.stable_docker_image | 2 +- .../python-horizon/centos/stx-horizon.stable_docker_image | 2 +- .../python-horizon/debian/stx-horizon.stable_docker_image | 2 +- .../python-keystone/centos/stx-keystone.stable_docker_image | 2 +- .../python-neutron/centos/stx-neutron.stable_docker_image | 4 ++-- openstack/python-nova/centos/stx-nova.stable_docker_image | 2 +- .../python-placement/centos/stx-placement.stable_docker_image | 2 +- .../python-placement/debian/stx-placement.stable_docker_image | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/openstack/openstack-aodh/centos/stx-aodh.stable_docker_image b/openstack/openstack-aodh/centos/stx-aodh.stable_docker_image index 0d4846fa..670d0a88 100644 --- a/openstack/openstack-aodh/centos/stx-aodh.stable_docker_image +++ b/openstack/openstack-aodh/centos/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 PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient" PROFILES="apache" CUSTOMIZATION="\ diff --git a/openstack/openstack-ironic/centos/stx-ironic.stable_docker_image b/openstack/openstack-ironic/centos/stx-ironic.stable_docker_image index 0be99667..89ece7eb 100644 --- a/openstack/openstack-ironic/centos/stx-ironic.stable_docker_image +++ b/openstack/openstack-ironic/centos/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 PIP_PACKAGES="pylint alembic pysnmp" DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils" PROFILES="ironic apache" diff --git a/openstack/python-barbican/centos/stx-barbican.stable_docker_image b/openstack/python-barbican/centos/stx-barbican.stable_docker_image index d67277d9..20b7dc8f 100644 --- a/openstack/python-barbican/centos/stx-barbican.stable_docker_image +++ b/openstack/python-barbican/centos/stx-barbican.stable_docker_image @@ -2,6 +2,6 @@ BUILDER=loci LABEL=stx-barbican PROJECT=barbican PROJECT_REPO=https://opendev.org/openstack/barbican.git -PROJECT_REF=stable/ussuri +PROJECT_REF=cc076f24e55c24a6fc8e57ca606130090fb6369b PIP_PACKAGES="pycrypto" PROFILES="fluent" diff --git a/openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image b/openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image index b93c3514..838d4b0a 100644 --- a/openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image +++ b/openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image @@ -2,6 +2,6 @@ BUILDER=loci LABEL=stx-ceilometer PROJECT=ceilometer PROJECT_REPO=https://opendev.org/openstack/ceilometer.git -PROJECT_REF=stable/ussuri +PROJECT_REF=bcada72c3aaeeb2a86de3368b1787a9253c9d55b PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient" DIST_PACKAGES="libvirt ipmitool" diff --git a/openstack/python-cinder/centos/stx-cinder.stable_docker_image b/openstack/python-cinder/centos/stx-cinder.stable_docker_image index d667264f..332f7b19 100644 --- a/openstack/python-cinder/centos/stx-cinder.stable_docker_image +++ b/openstack/python-cinder/centos/stx-cinder.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-cinder PROJECT=cinder PROJECT_REPO=https://opendev.org/openstack/cinder.git -PROJECT_REF=stable/ussuri +PROJECT_REF=79b012fbc8b6bc9dcce2c8c52a6fa63976a0309f DIST_PACKAGES="nfs-utils" PIP_PACKAGES="pycrypto python-swiftclient pylint" PROFILES="fluent cinder lvm ceph qemu" diff --git a/openstack/python-glance/centos/stx-glance.stable_docker_image b/openstack/python-glance/centos/stx-glance.stable_docker_image index 934d0702..0fbd129d 100644 --- a/openstack/python-glance/centos/stx-glance.stable_docker_image +++ b/openstack/python-glance/centos/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 PIP_PACKAGES="pycrypto python-swiftclient psutil pylint" DIST_PACKAGES="postgresql-libs" PROFILES="fluent glance ceph" diff --git a/openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image b/openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image index b0b331b6..21c8a908 100644 --- a/openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image +++ b/openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image @@ -2,6 +2,6 @@ BUILDER=loci LABEL=stx-heat PROJECT=heat PROJECT_REPO=https://opendev.org/openstack/heat.git -PROJECT_REF=stable/ussuri +PROJECT_REF=5466ede853bde7d636943cba017ed8265dcfd260 PIP_PACKAGES="pycrypto pylint" PROFILES="fluent heat apache" diff --git a/openstack/python-horizon/centos/stx-horizon.stable_docker_image b/openstack/python-horizon/centos/stx-horizon.stable_docker_image index 2a3810f2..60587b16 100644 --- a/openstack/python-horizon/centos/stx-horizon.stable_docker_image +++ b/openstack/python-horizon/centos/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 PIP_PACKAGES="pycrypto python-ceilometerclient \ coverage pyudev \ ldap pylint" diff --git a/openstack/python-horizon/debian/stx-horizon.stable_docker_image b/openstack/python-horizon/debian/stx-horizon.stable_docker_image index d5d7d732..d5caeb96 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 PIP_PACKAGES="pycryptodomex python-ceilometerclient \ coverage pyudev ldap" PROFILES="fluent horizon apache" diff --git a/openstack/python-keystone/centos/stx-keystone.stable_docker_image b/openstack/python-keystone/centos/stx-keystone.stable_docker_image index 97c6c001..96c8bede 100644 --- a/openstack/python-keystone/centos/stx-keystone.stable_docker_image +++ b/openstack/python-keystone/centos/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" PROFILES="fluent apache" CUSTOMIZATION="\ diff --git a/openstack/python-neutron/centos/stx-neutron.stable_docker_image b/openstack/python-neutron/centos/stx-neutron.stable_docker_image index 976f831f..4905cad2 100644 --- a/openstack/python-neutron/centos/stx-neutron.stable_docker_image +++ b/openstack/python-neutron/centos/stx-neutron.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-neutron PROJECT=neutron PROJECT_REPO=https://opendev.org/openstack/neutron.git -PROJECT_REF=stable/ussuri +PROJECT_REF=fe2445d99c430bb080ac45a19e4958b1ae7c9857 PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml" DIST_PACKAGES="ethtool lshw" -PROFILES="fluent neutron linuxbridge openvswitch" \ No newline at end of file +PROFILES="fluent neutron linuxbridge openvswitch" diff --git a/openstack/python-nova/centos/stx-nova.stable_docker_image b/openstack/python-nova/centos/stx-nova.stable_docker_image index 785dadbc..4ada19cb 100644 --- a/openstack/python-nova/centos/stx-nova.stable_docker_image +++ b/openstack/python-nova/centos/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="pycrypto httplib2 pylint python-ironicclient" DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs" PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache" diff --git a/openstack/python-placement/centos/stx-placement.stable_docker_image b/openstack/python-placement/centos/stx-placement.stable_docker_image index 76206560..b73d898c 100644 --- a/openstack/python-placement/centos/stx-placement.stable_docker_image +++ b/openstack/python-placement/centos/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 PIP_PACKAGES="pycrypto httplib2 pylint" PROFILES="apache" CUSTOMIZATION="\ diff --git a/openstack/python-placement/debian/stx-placement.stable_docker_image b/openstack/python-placement/debian/stx-placement.stable_docker_image index c0cb73ec..ee91400a 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 PIP_PACKAGES="pycryptodomex httplib2" PROFILES="apache" CUSTOMIZATION="\