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 * Use xenial builder to create the build.lock file. Change-Id: I0a12d86c92a024a958332fd0591cdee866428cd0
This commit is contained in:
parent
82305a91a9
commit
0e180598da
|
@ -0,0 +1,432 @@
|
|||
{
|
||||
"locks": [
|
||||
{
|
||||
"item": "layer:leadership",
|
||||
"vcs": null,
|
||||
"url": "https://git.launchpad.net/layer-leadership",
|
||||
"branch": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f",
|
||||
"type": "layer",
|
||||
"commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f"
|
||||
},
|
||||
{
|
||||
"item": "layer:options",
|
||||
"vcs": null,
|
||||
"url": "https://github.com/juju-solutions/layer-options.git",
|
||||
"branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56",
|
||||
"type": "layer",
|
||||
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
|
||||
},
|
||||
{
|
||||
"item": "layer:basic",
|
||||
"vcs": null,
|
||||
"url": "https://github.com/juju-solutions/layer-basic.git",
|
||||
"branch": "623e69c7b432456fd4364f6e1835424fd6b5425e",
|
||||
"type": "layer",
|
||||
"commit": "623e69c7b432456fd4364f6e1835424fd6b5425e"
|
||||
},
|
||||
{
|
||||
"item": "layer:openstack",
|
||||
"vcs": null,
|
||||
"url": "https://github.com/openstack/charm-layer-openstack",
|
||||
"branch": "ba152d41b4a1109073d335415f43c4248109e7c7",
|
||||
"type": "layer",
|
||||
"commit": "ba152d41b4a1109073d335415f43c4248109e7c7"
|
||||
},
|
||||
{
|
||||
"item": "layer:openstack-principle",
|
||||
"vcs": null,
|
||||
"url": "https://github.com/openstack/charm-layer-openstack-principle",
|
||||
"branch": "8100de4b24ab361423363c75599124708169d871",
|
||||
"type": "layer",
|
||||
"commit": "8100de4b24ab361423363c75599124708169d871"
|
||||
},
|
||||
{
|
||||
"item": "ironic-conductor",
|
||||
"vcs": null,
|
||||
"url": null,
|
||||
"branch": "12ae4abb03adf9b2939819a4b3331bb1e0540456",
|
||||
"type": "layer",
|
||||
"commit": "12ae4abb03adf9b2939819a4b3331bb1e0540456"
|
||||
},
|
||||
{
|
||||
"item": "interface:tls-certificates",
|
||||
"vcs": null,
|
||||
"url": "https://github.com/juju-solutions/interface-tls-certificates",
|
||||
"branch": "d9850016d930a6d507b9fd45e2598d327922b140",
|
||||
"type": "layer",
|
||||
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
|
||||
},
|
||||
{
|
||||
"item": "interface:mysql-shared",
|
||||
"vcs": null,
|
||||
"url": "https://github.com/openstack/charm-interface-mysql-shared",
|
||||
"branch": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c",
|
||||
"type": "layer",
|
||||
"commit": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c"
|
||||
},
|
||||
{
|
||||
"item": "interface:rabbitmq",
|
||||
"vcs": null,
|
||||
"url": "https://github.com/openstack/charm-interface-rabbitmq",
|
||||
"branch": "383121fc584d2d3bf9d233eba0d3708398a4c468",
|
||||
"type": "layer",
|
||||
"commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
|
||||
},
|
||||
{
|
||||
"item": "interface:keystone-credentials",
|
||||
"vcs": null,
|
||||
"url": "https://github.com/openstack/charm-interface-keystone-credentials",
|
||||
"branch": "53e93b8820899f2251d207ed5d5c3b212ceb64de",
|
||||
"type": "layer",
|
||||
"commit": "53e93b8820899f2251d207ed5d5c3b212ceb64de"
|
||||
},
|
||||
{
|
||||
"item": "interface:ironic-api",
|
||||
"vcs": null,
|
||||
"url": "https://opendev.org/openstack/charm-interface-ironic-api.git",
|
||||
"branch": "945ba01c692be7a160eb92dce53b0f3dcd558441",
|
||||
"type": "layer",
|
||||
"commit": "945ba01c692be7a160eb92dce53b0f3dcd558441"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "charms.reactive",
|
||||
"version": "1.4.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "pytz",
|
||||
"version": "2021.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "cffi",
|
||||
"version": "1.14.5"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "setuptools_scm",
|
||||
"version": "3.4.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "netifaces",
|
||||
"version": "0.10.9"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "PyYAML",
|
||||
"version": "5.2"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "psutil",
|
||||
"version": "5.8.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "stevedore",
|
||||
"version": "1.32.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "pyaml",
|
||||
"version": "20.4.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "pyOpenSSL",
|
||||
"version": "19.0.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "netaddr",
|
||||
"version": "0.7.19"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "oslo.i18n",
|
||||
"version": "3.25.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "python-swiftclient",
|
||||
"version": "3.11.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "urllib3",
|
||||
"version": "1.26.4"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "oslo.utils",
|
||||
"version": "3.42.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "oslo.serialization",
|
||||
"version": "2.29.3"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "setuptools",
|
||||
"version": "41.6.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "wheel",
|
||||
"version": "0.33.6"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "asn1crypto",
|
||||
"version": "1.4.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "Babel",
|
||||
"version": "2.9.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "pyparsing",
|
||||
"version": "2.4.7"
|
||||
},
|
||||
{
|
||||
"vcs": "git",
|
||||
"url": "git+https://opendev.org/openstack/charms.openstack.git",
|
||||
"package": "charms.openstack",
|
||||
"branch": "stable/21.04",
|
||||
"version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1",
|
||||
"type": "python_module"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "importlib_metadata",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "six",
|
||||
"version": "1.15.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "attrs",
|
||||
"version": "20.3.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "iso8601",
|
||||
"version": "0.1.14"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "pyrsistent",
|
||||
"version": "0.17.3"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "jsonpatch",
|
||||
"version": "1.32"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "idna",
|
||||
"version": "2.10"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "python-keystoneclient",
|
||||
"version": "3.22.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "MarkupSafe",
|
||||
"version": "1.1.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "os-service-types",
|
||||
"version": "1.7.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "certifi",
|
||||
"version": "2020.12.5"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "Tempita",
|
||||
"version": "0.5.2"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "pbr",
|
||||
"version": "5.5.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "oslo.config",
|
||||
"version": "7.0.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "wrapt",
|
||||
"version": "1.12.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "rfc3986",
|
||||
"version": "1.4.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "dnspython",
|
||||
"version": "1.16.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "cryptography",
|
||||
"version": "2.3.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "zipp",
|
||||
"version": "1.2.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "requests",
|
||||
"version": "2.25.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "pycparser",
|
||||
"version": "2.20"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "prettytable",
|
||||
"version": "0.7.2"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "python-glanceclient",
|
||||
"version": "3.0.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "jsonschema",
|
||||
"version": "3.2.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "pip",
|
||||
"version": "18.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "warlock",
|
||||
"version": "1.3.3"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "Jinja2",
|
||||
"version": "2.10.1"
|
||||
},
|
||||
{
|
||||
"vcs": "git",
|
||||
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||
"package": "charmhelpers",
|
||||
"branch": "stable/21.04",
|
||||
"version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6",
|
||||
"type": "python_module"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "msgpack",
|
||||
"version": "1.0.2"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "jsonpointer",
|
||||
"version": "2.1"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "debtcollector",
|
||||
"version": "1.22.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "toml",
|
||||
"version": "0.10.2"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "chardet",
|
||||
"version": "4.0.0"
|
||||
},
|
||||
{
|
||||
"vcs": null,
|
||||
"type": "python_module",
|
||||
"package": "keystoneauth1",
|
||||
"version": "4.1.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
|
||||
|
|
|
@ -9,6 +9,6 @@ python-keystoneclient
|
|||
zipp < 2.0.0
|
||||
importlib-metadata>=2.0
|
||||
|
||||
git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
|
||||
git+https://opendev.org/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack
|
||||
|
||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||
git+https://github.com/juju/charm-helpers.git@stable/21.04#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/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