Updates for stable branch creation
- Set default branch for git review/gerrit. - Switch tests to stable. - Switch to using stable charm-helpers branch. - Switch to using stable charm.openstack branch. - Switch to using stable zaza, zaza-openstack-tests branch - (reactive charms) Add build.lock file Change-Id: I99d92375d2ce3ae05f242e14b3861cdd2e47a025
This commit is contained in:
parent
c9f9802fdd
commit
fee7883d0c
|
@ -2,3 +2,5 @@
|
|||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-nova-cell-controller.git
|
||||
|
||||
defaultbranch=stable/yoga
|
||||
|
|
|
@ -0,0 +1,254 @@
|
|||
{
|
||||
"locks": [
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:options",
|
||||
"url": "https://github.com/juju-solutions/layer-options.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:basic",
|
||||
"url": "https://github.com/juju-solutions/layer-basic.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "fb767dcf0786d1d5364199bb3b40bdc86518b45b"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "e0f700eacb026235e1a04e7cbc28dfbe9d4e4520"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack-principle",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack-principle",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "2541283a7f9c3fa923c0fccd7257e217e11dadcd"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:openstack-api",
|
||||
"url": "https://github.com/openstack/charm-layer-openstack-api",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "nova-cell-controller",
|
||||
"url": null,
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/stable/yoga\nrefs/heads/yoga-updates",
|
||||
"commit": "refs/heads/stable/yoga\nrefs/heads/yoga-updates"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:tls-certificates",
|
||||
"url": "https://github.com/juju-solutions/interface-tls-certificates",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:mysql-shared",
|
||||
"url": "https://github.com/openstack/charm-interface-mysql-shared",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "f90f8c6edce21e4da3a872f0f9d6761730ce025d"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:rabbitmq",
|
||||
"url": "https://github.com/openstack/charm-interface-rabbitmq",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:keystone",
|
||||
"url": "https://github.com/openstack/charm-interface-keystone",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "501af18b3036f5af92990bc39e750e76e393e5eb"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:hacluster",
|
||||
"url": "https://github.com/openstack/charm-interface-hacluster.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "2b714e90b1b8845ce7390bb1dad5a56a65437907"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:openstack-ha",
|
||||
"url": "https://github.com/openstack/charm-interface-openstack-ha",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:nova-compute",
|
||||
"url": "https://github.com/openstack/charm-interface-nova-compute.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "ea0721a6fa4c3db2fdbee4622e29870e865f58ad"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:nova-cell",
|
||||
"url": "https://github.com/openstack/charm-interface-nova-cell.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "620f9eef998ef587d951e1475a1e2168551e3d23"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:keystone-credentials",
|
||||
"url": "https://github.com/openstack/charm-interface-keystone-credentials",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "53e93b8820899f2251d207ed5d5c3b212ceb64de"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.reactive",
|
||||
"vcs": null,
|
||||
"version": "1.5.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools_scm",
|
||||
"vcs": null,
|
||||
"version": "6.4.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pip",
|
||||
"vcs": null,
|
||||
"version": "22.0.4"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Tempita",
|
||||
"vcs": null,
|
||||
"version": "0.4"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "MarkupSafe",
|
||||
"vcs": null,
|
||||
"version": "2.1.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "wheel",
|
||||
"vcs": null,
|
||||
"version": "0.37.1"
|
||||
},
|
||||
{
|
||||
"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": "dnspython",
|
||||
"vcs": null,
|
||||
"version": "1.16.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charmhelpers",
|
||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||
"branch": "refs/heads/stable/yoga",
|
||||
"version": "971ac5117c96bd1cb4a6a520787e4509564da582",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pyparsing",
|
||||
"vcs": null,
|
||||
"version": "3.0.8"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netaddr",
|
||||
"vcs": null,
|
||||
"version": "0.7.19"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.openstack",
|
||||
"url": "git+https://github.com/openstack/charms.openstack.git",
|
||||
"branch": "refs/heads/stable/yoga",
|
||||
"version": "13ef220ce3529fa7b8e11c6e4c5b352d05b6f148",
|
||||
"vcs": "git"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netifaces",
|
||||
"vcs": null,
|
||||
"version": "0.11.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "flit_core",
|
||||
"vcs": null,
|
||||
"version": "3.7.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Jinja2",
|
||||
"vcs": null,
|
||||
"version": "3.1.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "psutil",
|
||||
"vcs": null,
|
||||
"version": "5.9.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "PyYAML",
|
||||
"vcs": null,
|
||||
"version": "5.3.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pbr",
|
||||
"vcs": null,
|
||||
"version": "5.8.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools",
|
||||
"vcs": null,
|
||||
"version": "49.6.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "packaging",
|
||||
"vcs": null,
|
||||
"version": "21.3"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -8,5 +8,5 @@
|
|||
tox
|
||||
|
||||
# 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/yoga#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
setuptools < 50.0
|
||||
|
||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||
git+https://github.com/openstack/charms.openstack.git@stable/yoga#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers.git@stable/yoga#egg=charmhelpers
|
||||
|
|
|
@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
|
|||
|
||||
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/yoga#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue