openstack
/
charm-barbican
Code Issues Proposed changes

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: I54a885b9882181f516632d498bf63449b3f61e37
changes/13/838113/2
Alex Kavanagh 2022-04-15 11:41:53 +01:00 committed by Liam Young
parent 8415ded62a
commit 4a6c6be2bf
5 changed files with 261 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-barbican.git
defaultbranch=stable/yoga

254
src/build.lock Normal file
View File

@ -0,0 +1,254 @@
{
"locks": [
{
"type": "layer",
"item": "layer:leadership",
"url": "https://git.launchpad.net/layer-leadership",
"vcs": null,
"branch": "refs/heads/master",
"commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f"
},
{
"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": "barbican",
"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:barbican-hsm",
"url": "https://opendev.org/x/charm-interface-barbican-hsm",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a2705db6a534bdc61bfac2b69f539ead165da4b9"
},
{
"type": "layer",
"item": "interface:barbican-secrets",
"url": "https://github.com/openstack/charm-interface-barbican-secrets.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "4cae88ff57db96b9394bf6b70982a5ff4ee8bcef"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "2.1.1"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "21.10.1"
},
{
"type": "python_module",
"package": "packaging",
"vcs": null,
"version": "21.3"
},
{
"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": "Jinja2",
"vcs": null,
"version": "3.1.1"
},
{
"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": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "refs/heads/stable/yoga",
"version": "971ac5117c96bd1cb4a6a520787e4509564da582",
"vcs": "git"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "22.0.4"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "5.3.1"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.9.0"
},
{
"type": "python_module",
"package": "flit_core",
"vcs": null,
"version": "3.7.1"
},
{
"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": "pbr",
"vcs": null,
"version": "5.8.1"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.37.1"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.5.0"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "tomli",
"vcs": null,
"version": "2.0.1"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.11.0"
},
{
"type": "python_module",
"package": "Tempita",
"vcs": null,
"version": "0.4"
}
]
}

4
src/test-requirements.txt
View File

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

4
src/wheelhouse.txt
View File

@ -1,5 +1,5 @@
psutil
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

2
test-requirements.txt
View File

@ -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:
#