From 834d9da3425364299eebb888405a7c35bc4f81b0 Mon Sep 17 00:00:00 2001 From: Thales Elero Cervi Date: Fri, 16 Feb 2024 16:40:54 -0300 Subject: [PATCH] Set application references for stx.9.0 release Now that stx-openstack application is more up-to-date with OpenStack releases timeline, using "stable/" git references is not advised since such branches can receive fixes cherry-picks on upstream repos and therefore make our stx-* images build not fixed to a given source code version [1]. This change sets all upstream repos references to commits SHAs, as per of today 2024 Feb 16th, so StarlingX release 9.0 will have a stable and reproducible build. If there is the need of cherry-picking any OpenStack upstream fix, this should be handled by a specific task/launchpad later (on StarlingX master branch). With the commit SHAs aligned, application release info can be set to StarlingX 9.0 release (as peer other applications). [1] https://bugs.launchpad.net/starlingx/+bug/2052644 Story: 2010715 Task: 49588 TEST PLAN: PASS: build-helm-charts.sh --os debian --package stx-openstack-helm-fluxcd --app stx-openstack PASS: build-wheel-tarball.sh --keep-image PASS: build-stx-images.sh --only stx-aodh,stx-ironic,stx-barbican, stx-ceilometer,stx-cinder,stx-glance,stx-heat,stx-horizon, stx-keystone,stx-neutron,stx-nova,stx-placement Change-Id: Id1cf2cbd49f0b2b5fb7d02524794310d92be8f22 Signed-off-by: Thales Elero Cervi --- helm-charts-release-info.inc | 4 ++++ .../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 +- .../debian/stx-ceilometer.stable_docker_image | 2 +- .../python-cinder/debian/stx-cinder.stable_docker_image | 2 +- .../python-glance/debian/stx-glance.stable_docker_image | 2 +- .../openstack-heat/debian/stx-heat.stable_docker_image | 2 +- .../python-horizon/debian/stx-horizon.stable_docker_image | 2 +- .../python-keystone/debian/stx-keystone.stable_docker_image | 2 +- .../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 +- 13 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 helm-charts-release-info.inc diff --git a/helm-charts-release-info.inc b/helm-charts-release-info.inc new file mode 100644 index 00000000..f8313ba0 --- /dev/null +++ b/helm-charts-release-info.inc @@ -0,0 +1,4 @@ +# Helm charts tarball version +# Used by cgcs-root/build-tools/build-helm-charts.sh +VERSION=24.03 +RELEASE=0 diff --git a/upstream/openstack/openstack-aodh/debian/stx-aodh.stable_docker_image b/upstream/openstack/openstack-aodh/debian/stx-aodh.stable_docker_image index 0cb14299..d0e3bf0a 100644 --- a/upstream/openstack/openstack-aodh/debian/stx-aodh.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=61691e5d96fd97547807bece2910d4d982d457c1 DIST_REPOS="OS" UPGRADE_PIP_PACKAGES=pip PROJECT_UID=42425 diff --git a/upstream/openstack/openstack-ironic/debian/stx-ironic.stable_docker_image b/upstream/openstack/openstack-ironic/debian/stx-ironic.stable_docker_image index 366bec20..4502a646 100644 --- a/upstream/openstack/openstack-ironic/debian/stx-ironic.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=1de7c29556245c63ae057f035ce6d6d175e01fb9 PROJECT_UID=42425 PROJECT_GID=42425 DIST_REPOS="OS" diff --git a/upstream/openstack/python-barbican/debian/stx-barbican.stable_docker_image b/upstream/openstack/python-barbican/debian/stx-barbican.stable_docker_image index c2d47416..88c59b7e 100644 --- a/upstream/openstack/python-barbican/debian/stx-barbican.stable_docker_image +++ b/upstream/openstack/python-barbican/debian/stx-barbican.stable_docker_image @@ -3,7 +3,7 @@ LABEL=stx-barbican PROJECT=barbican DIST_REPOS="OS" PROJECT_REPO=https://opendev.org/openstack/barbican.git -PROJECT_REF=stable/2023.1 +PROJECT_REF=b38b21392ab3bba8df5be16730dda2e13c92e55c NON_UNIQUE_SYSTEM_ACCOUNT="yes" PIP_PACKAGES="pycryptodomex" PROFILES="fluent" diff --git a/upstream/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image b/upstream/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image index 03e1eedb..db76bf80 100644 --- a/upstream/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=a0385d3c52f85b9cecdc43f30eb72e99177fe691 NON_UNIQUE_SYSTEM_ACCOUNT="yes" UPDATE_SYSTEM_ACCOUNT="yes" DIST_REPOS="OS" diff --git a/upstream/openstack/python-cinder/debian/stx-cinder.stable_docker_image b/upstream/openstack/python-cinder/debian/stx-cinder.stable_docker_image index d2c3b272..9a0de7ef 100644 --- a/upstream/openstack/python-cinder/debian/stx-cinder.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=e848c7cfc75c549b22be2b02a9f8360f5db2b246 UPGRADE_PIP_PACKAGES=pip PROJECT_UID=42425 PROJECT_GID=42425 diff --git a/upstream/openstack/python-glance/debian/stx-glance.stable_docker_image b/upstream/openstack/python-glance/debian/stx-glance.stable_docker_image index 7bb46495..72cf948e 100644 --- a/upstream/openstack/python-glance/debian/stx-glance.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=285021bdb0ea344f995508fabb8b4e2485f2cf3c DIST_REPOS="OS" UPDATE_SYSTEM_ACCOUNT="yes" NON_UNIQUE_SYSTEM_ACCOUNT="yes" diff --git a/upstream/openstack/python-heat/openstack-heat/debian/stx-heat.stable_docker_image b/upstream/openstack/python-heat/openstack-heat/debian/stx-heat.stable_docker_image index 4e88a7c4..cfc93e0d 100644 --- a/upstream/openstack/python-heat/openstack-heat/debian/stx-heat.stable_docker_image +++ b/upstream/openstack/python-heat/openstack-heat/debian/stx-heat.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-heat PROJECT=heat PROJECT_REPO=https://opendev.org/openstack/heat.git -PROJECT_REF=stable/2023.1 +PROJECT_REF=91709d22020c8cdba8fab19a00854e65bde90887 DIST_REPOS="OS" NON_UNIQUE_SYSTEM_ACCOUNT="yes" PIP_PACKAGES="pycryptodomex" diff --git a/upstream/openstack/python-horizon/debian/stx-horizon.stable_docker_image b/upstream/openstack/python-horizon/debian/stx-horizon.stable_docker_image index 145ae793..14e20f50 100644 --- a/upstream/openstack/python-horizon/debian/stx-horizon.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=068e207393455441e7bad0eb5958be6a3c35f505 UPGRADE_PIP_PACKAGES=pip DIST_REPOS="OS" PROJECT_UID=42425 diff --git a/upstream/openstack/python-keystone/debian/stx-keystone.stable_docker_image b/upstream/openstack/python-keystone/debian/stx-keystone.stable_docker_image index 6bbc4c4d..204b0df6 100644 --- a/upstream/openstack/python-keystone/debian/stx-keystone.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=828519f4636a3c4a5c77975b970833e0ae62955c PIP_PACKAGES="\ ldap \ ldappool \ diff --git a/upstream/openstack/python-neutron/debian/stx-neutron.stable_docker_image b/upstream/openstack/python-neutron/debian/stx-neutron.stable_docker_image index 56801db9..a9b407b7 100644 --- a/upstream/openstack/python-neutron/debian/stx-neutron.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=69f64a1f8085e7e9033592c62b1ab50bb4ce4295 UPDATE_SYSTEM_ACCOUNT="yes" NON_UNIQUE_SYSTEM_ACCOUNT="yes" PIP_PACKAGES="\ diff --git a/upstream/openstack/python-nova/debian/stx-nova.stable_docker_image b/upstream/openstack/python-nova/debian/stx-nova.stable_docker_image index bba9afe3..27ee6ff5 100644 --- a/upstream/openstack/python-nova/debian/stx-nova.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=4b4fc274812e4c0bbc724c45a7c7d01a4cd657dc PIP_PACKAGES="\ httplib2 \ pycryptodomex \ diff --git a/upstream/openstack/python-placement/debian/stx-placement.stable_docker_image b/upstream/openstack/python-placement/debian/stx-placement.stable_docker_image index 3092b0f2..3a479abf 100644 --- a/upstream/openstack/python-placement/debian/stx-placement.stable_docker_image +++ b/upstream/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/2023.1 +PROJECT_REF=b3652feea1855c9481c9441976379d9851c0c62f PROJECT_UID=42425 PROJECT_GID=42425 PIP_PACKAGES="pycryptodomex httplib2"