21.04 libraries freeze for charms on master branch
* charm-helpers sync for classic charms * build.lock file for reactive charms * ensure tox.ini is from release-tools * ensure requirements.txt files are from release-tools * On reactive charms: - ensure stable/21.04 branch for charms.openstack - ensure stable/21.04 branch for charm-helpers Change-Id: Idb10e8a583534000bb195162fa6d28c9b725be84
This commit is contained in:
parent
a61762a850
commit
d13e2f1166
|
@ -0,0 +1,154 @@
|
|||
{
|
||||
"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": "623e69c7b432456fd4364f6e1835424fd6b5425e"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "layer:leadership",
|
||||
"url": "https://git.launchpad.net/layer-leadership",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "magpie",
|
||||
"url": null,
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "a61762a8500a38e7a75022a40cf6cd48cda1d09d"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:magpie",
|
||||
"url": "https://opendev.org/openstack/charm-interface-magpie.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "3cba94a520befa0f20f3e88c3aaefcf71c597250"
|
||||
},
|
||||
{
|
||||
"type": "layer",
|
||||
"item": "interface:http",
|
||||
"url": "https://github.com/juju-solutions/interface-http.git",
|
||||
"vcs": null,
|
||||
"branch": "refs/heads/master",
|
||||
"commit": "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netaddr",
|
||||
"vcs": null,
|
||||
"version": "0.7.19"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pbr",
|
||||
"vcs": null,
|
||||
"version": "5.5.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools",
|
||||
"vcs": null,
|
||||
"version": "41.6.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Jinja2",
|
||||
"vcs": null,
|
||||
"version": "2.10.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pip",
|
||||
"vcs": null,
|
||||
"version": "18.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "pyaml",
|
||||
"vcs": null,
|
||||
"version": "20.4.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "MarkupSafe",
|
||||
"vcs": null,
|
||||
"version": "1.1.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charmhelpers",
|
||||
"vcs": null,
|
||||
"version": "0.20.21"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "wheel",
|
||||
"vcs": null,
|
||||
"version": "0.33.6"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "charms.reactive",
|
||||
"vcs": null,
|
||||
"version": "1.4.1"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "prometheus_client",
|
||||
"vcs": null,
|
||||
"version": "0.10.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "Tempita",
|
||||
"vcs": null,
|
||||
"version": "0.5.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "PyYAML",
|
||||
"vcs": null,
|
||||
"version": "5.2"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "setuptools_scm",
|
||||
"vcs": null,
|
||||
"version": "1.17.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "psutil",
|
||||
"vcs": null,
|
||||
"version": "5.8.0"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "netifaces",
|
||||
"vcs": null,
|
||||
"version": "0.10.9"
|
||||
},
|
||||
{
|
||||
"type": "python_module",
|
||||
"package": "six",
|
||||
"vcs": null,
|
||||
"version": "1.15.0"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -11,5 +11,5 @@ charm-tools>=2.4.4
|
|||
keyring<21
|
||||
|
||||
# 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/21.04#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack
|
||||
|
|
|
@ -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/21.04#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
netifaces # vault
|
||||
|
|
7
tox.ini
7
tox.ini
|
@ -28,7 +28,12 @@ deps =
|
|||
[testenv:build]
|
||||
basepython = python3
|
||||
commands =
|
||||
charm-build --log-level DEBUG -o {toxinidir}/build/builds src {posargs}
|
||||
charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
|
||||
|
||||
[testenv:add-build-lock-file]
|
||||
basepython = python3
|
||||
commands =
|
||||
charm-build --log-level DEBUG --write-lock-file -o {toxinidir}/build/builds src {posargs}
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
|
|
Loading…
Reference in New Issue