Stable artefacts for stable/2023.1 (antelope)
This patch is to lock the stable/2023.1 (antelope release) charms down so that as much as possible. In particular, this patch does: - set the .gitreview to stable/2023.1 - lock zaza and zaza-openstack-tests to stable/antelope branches - for reactive charms Add build.lock files to lock the layers and python modules used to build the charm. - for ops framework charms, extract a pip freeze from the charmcraft container after building the charm to lock the modules used to build the charm. - drop the kinetic bundles if the exist. (Note the updates to tests.yaml is in another batch (topic: antelope-voting) - update the bundles so that they point to the antelope specific channels. e.g. 2023.1/edge for OpenStack charms, 23.03/edge for OVN charms, quincy/edge for Ceph charms and generally, the appropriate LTS Jammy branch for the various support charms. Change-Id: Ibf7c61b0afd1754dd4ff4c0e72f60baf9a958008
This commit is contained in:
parent
b4943cc688
commit
3c8a213084
|
@ -2,3 +2,5 @@
|
|||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-manila-generic.git
|
||||
|
||||
defaultbranch=stable/2023.1
|
||||
|
|
|
@ -8,6 +8,8 @@ parts:
|
|||
- libpython3-dev
|
||||
build-snaps:
|
||||
- charm
|
||||
build-packages:
|
||||
- python3-dev
|
||||
build-environment:
|
||||
- CHARM_INTERFACES_DIR: /root/project/interfaces/
|
||||
- CHARM_LAYERS_DIR: /root/project/layers/
|
||||
|
|
|
@ -0,0 +1,182 @@
|
|||
{
|
||||
"locks": [
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:options",
|
||||
"url": "https://github.com/juju-solutions/layer-options.git",
|
||||
"vcs": null,
|
||||
"branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56",
|
||||
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:basic",
|
||||
"url": "https://github.com/juju-solutions/layer-basic.git",
|
||||
"vcs": null,
|
||||
"branch": "a41b3559d629993d960af65104108f66ab9795a8",
|
||||
"commit": "a41b3559d629993d960af65104108f66ab9795a8"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack",
|
||||
"vcs": null,
|
||||
"branch": "1c9e662d78b328c6d4587171ccba08572e8dcf25",
|
||||
"commit": "1c9e662d78b328c6d4587171ccba08572e8dcf25"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "manila-generic",
|
||||
"url": null,
|
||||
"vcs": null,
|
||||
"branch": null,
|
||||
"commit": ""
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:tls-certificates",
|
||||
"url": "https://github.com/juju-solutions/interface-tls-certificates",
|
||||
"vcs": null,
|
||||
"branch": "61e9f278fc8c8119b1d4810ac39e2275be58e9ce",
|
||||
"commit": "61e9f278fc8c8119b1d4810ac39e2275be58e9ce"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:manila-plugin",
|
||||
"url": "https://github.com/openstack/charm-interface-manila-plugin",
|
||||
"vcs": null,
|
||||
"branch": "14cb348a09b30c92de89878c58e790779ebdad23",
|
||||
"commit": "14cb348a09b30c92de89878c58e790779ebdad23"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "psutil",
|
||||
"vcs": null,
|
||||
"version": "5.9.5"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netaddr",
|
||||
"vcs": null,
|
||||
"version": "0.7.19"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pyaml",
|
||||
"vcs": null,
|
||||
"version": "21.10.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "tomli",
|
||||
"vcs": null,
|
||||
"version": "2.0.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Cython",
|
||||
"vcs": null,
|
||||
"version": "0.29.34"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "flit_core",
|
||||
"vcs": null,
|
||||
"version": "3.8.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "poetry_core",
|
||||
"vcs": null,
|
||||
"version": "1.5.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Jinja2",
|
||||
"vcs": null,
|
||||
"version": "3.1.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netifaces",
|
||||
"vcs": null,
|
||||
"version": "0.11.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "MarkupSafe",
|
||||
"vcs": null,
|
||||
"version": "2.1.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.reactive",
|
||||
"vcs": null,
|
||||
"version": "1.5.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "dnspython",
|
||||
"vcs": null,
|
||||
"version": "2.3.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools_scm",
|
||||
"vcs": null,
|
||||
"version": "6.4.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools",
|
||||
"vcs": null,
|
||||
"version": "62.1.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "PyYAML",
|
||||
"vcs": null,
|
||||
"version": "6.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.openstack",
|
||||
"url": "git+https://github.com/openstack/charms.openstack.git",
|
||||
"branch": "stable/antelope",
|
||||
"version": "7a589883545284e0a6303c7977402afb38e99d46",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pbr",
|
||||
"vcs": null,
|
||||
"version": "5.11.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "packaging",
|
||||
"vcs": null,
|
||||
"version": "23.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pip",
|
||||
"vcs": null,
|
||||
"version": "22.0.4"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charmhelpers",
|
||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||
"branch": "stable/antelope",
|
||||
"version": "b9444c20fdf3dc938790ed208cd1053b60055590",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "wheel",
|
||||
"vcs": null,
|
||||
"version": "0.40.0"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -5,5 +5,5 @@
|
|||
#
|
||||
|
||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
||||
git+https://github.com/openstack-charmers/zaza.git@stable/antelope#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/antelope#egg=zaza.openstack
|
||||
|
|
|
@ -22,21 +22,21 @@ services:
|
|||
|
||||
manila-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
source: distro
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
manila:
|
||||
charm: ch:manila
|
||||
|
@ -46,7 +46,7 @@ services:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
manila-generic:
|
||||
charm: ../../../manila-generic.charm
|
||||
|
@ -58,7 +58,7 @@ services:
|
|||
num_units: 1
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
|
@ -67,7 +67,7 @@ services:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
nrpe:
|
||||
charm: ch:nrpe
|
||||
channel: latest/edge
|
||||
|
|
|
@ -22,21 +22,21 @@ services:
|
|||
|
||||
manila-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
source: distro
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
manila:
|
||||
charm: ch:manila
|
||||
|
@ -46,7 +46,7 @@ services:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
manila-generic:
|
||||
charm: ../../../manila-generic.charm
|
||||
|
@ -58,7 +58,7 @@ services:
|
|||
num_units: 1
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
|
@ -67,7 +67,7 @@ services:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
nrpe:
|
||||
charm: ch:nrpe
|
||||
channel: latest/edge
|
||||
|
|
|
@ -20,21 +20,21 @@ services:
|
|||
|
||||
manila-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
mysql-innodb-cluster:
|
||||
charm: ch:mysql-innodb-cluster
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
source: distro
|
||||
to:
|
||||
- '0'
|
||||
- '1'
|
||||
- '2'
|
||||
channel: latest/edge
|
||||
channel: 8.0/edge
|
||||
|
||||
manila:
|
||||
charm: ch:manila
|
||||
|
@ -44,7 +44,7 @@ services:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
|
||||
manila-generic:
|
||||
charm: ../../../manila-generic.charm
|
||||
|
@ -56,7 +56,7 @@ services:
|
|||
num_units: 1
|
||||
to:
|
||||
- '4'
|
||||
channel: latest/edge
|
||||
channel: 3.9/edge
|
||||
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
|
@ -65,7 +65,7 @@ services:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2023.1/edge
|
||||
nrpe:
|
||||
charm: ch:nrpe
|
||||
channel: latest/edge
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/antelope#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers.git@stable/antelope#egg=charmhelpers
|
||||
|
|
|
@ -19,7 +19,7 @@ mock>=1.2
|
|||
|
||||
nose>=1.3.7
|
||||
coverage>=3.6
|
||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/antelope#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue