starlingx
/
upstream
Code Issues Proposed changes

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/panko       0a8d5b4fc0169108468404e88d12ee6fefed4e63
* 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.6.0` cherry-pick notes:
------------------------------

  Since this release has images based on CentOS, the original changes
  had to be adapted to change the files corresponding to that OS.

  Additionally, as this is the only currently maintained release that
  still builds `stx-panko`, the build instructions for that project had
  to be updated as well.

Partial-Bug: 2019015

Change-Id: Ibf589444237664dd9e4ab8314ca1c8ad44f80ec7
Signed-off-by: Luan Nunes Utimura <LuanNunes.Utimura@windriver.com>
(cherry picked from commit 67c274141a)
(cherry picked from commit 7243a5140f)
This commit is contained in:
Luan Nunes Utimura 2023-05-09 16:08:45 -03:00
parent c36c729f60
commit 52961f16e1
13 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/openstack-aodh/centos/stx-aodh.stable_docker_image
View File

@ -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="\

2
openstack/openstack-ironic/centos/stx-ironic.stable_docker_image
View File

@ -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"

2
openstack/openstack-panko/centos/stx-panko.stable_docker_image
View File

@ -2,7 +2,7 @@ BUILDER=loci
LABEL=stx-panko
PROJECT=panko
PROJECT_REPO=https://opendev.org/openstack/panko.git
PROJECT_REF=stable/ussuri
PROJECT_REF=0a8d5b4fc0169108468404e88d12ee6fefed4e63
PIP_PACKAGES="pylint python-openstackclient pankoclient"
PROFILES="apache"
CUSTOMIZATION="\

2
openstack/python-barbican/centos/stx-barbican.stable_docker_image
View File

@ -2,7 +2,7 @@ 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"
PYTHON3=yes

2
openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image
View File

@ -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="pylint libvirt-python panko==5.0.0 gnocchiclient"
DIST_PACKAGES="libvirt ipmitool"
PYTHON3=yes

2
openstack/python-cinder/centos/stx-cinder.stable_docker_image
View File

@ -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"

2
openstack/python-glance/centos/stx-glance.stable_docker_image
View File

@ -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"

2
openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image
View File

@ -2,7 +2,7 @@ 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"
PYTHON3=yes

2
openstack/python-horizon/centos/stx-horizon.stable_docker_image
View File

@ -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"

2
openstack/python-keystone/centos/stx-keystone.stable_docker_image
View File

@ -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="\

4
openstack/python-neutron/centos/stx-neutron.stable_docker_image
View File

@ -2,8 +2,8 @@ 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"
PYTHON3=yes
PYTHON3=yes

2
openstack/python-nova/centos/stx-nova.stable_docker_image
View File

@ -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"

2
openstack/python-placement/centos/stx-placement.stable_docker_image
View File

@ -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="\