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 * Manual fix to build.lock to work around bug [1] [1] https://github.com/juju/charm-tools/issues/603 Change-Id: I6be25d404436647a19e18231ccd0985dd49bb858
This commit is contained in:
parent
c8feba48a5
commit
46797fc986
198
src/build.lock
Normal file
198
src/build.lock
Normal file
@ -0,0 +1,198 @@
|
|||||||
|
{
|
||||||
|
"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:openstack",
|
||||||
|
"url": "https://github.com/openstack/charm-layer-openstack",
|
||||||
|
"vcs": null,
|
||||||
|
"branch": "refs/heads/master",
|
||||||
|
"commit": "ba152d41b4a1109073d335415f43c4248109e7c7"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "layer",
|
||||||
|
"item": "layer:ceph",
|
||||||
|
"url": "https://github.com/openstack/charm-layer-ceph.git",
|
||||||
|
"vcs": null,
|
||||||
|
"branch": "refs/heads/master",
|
||||||
|
"commit": "17d40abd8d9ec3b8c32756ca981c80c4733c016f"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "layer",
|
||||||
|
"item": "ceph-fs",
|
||||||
|
"url": null,
|
||||||
|
"vcs": null,
|
||||||
|
"branch": "refs/heads/master",
|
||||||
|
"commit": "c8feba48a592445f20ed247e45866077c01a114d"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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:ceph-mds",
|
||||||
|
"url": "https://opendev.org/openstack/charm-interface-ceph-client.git",
|
||||||
|
"vcs": null,
|
||||||
|
"branch": "refs/heads/master",
|
||||||
|
"commit": "72245e1d002fb9c65c9574d65b5952275b3411fb"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python_module",
|
||||||
|
"package": "dnspython",
|
||||||
|
"vcs": null,
|
||||||
|
"version": "1.15.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python_module",
|
||||||
|
"package": "charms.openstack",
|
||||||
|
"url": "git+https://opendev.org/openstack/charms.openstack.git",
|
||||||
|
"branch": "refs/heads/stable/21.04",
|
||||||
|
"version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1",
|
||||||
|
"vcs": "git"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python_module",
|
||||||
|
"package": "netaddr",
|
||||||
|
"vcs": null,
|
||||||
|
"version": "0.7.19"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python_module",
|
||||||
|
"package": "ceph_api",
|
||||||
|
"vcs": null,
|
||||||
|
"version": "0.4.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python_module",
|
||||||
|
"package": "dnspython3",
|
||||||
|
"vcs": null,
|
||||||
|
"version": "1.15.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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": "pyxattr",
|
||||||
|
"vcs": null,
|
||||||
|
"version": "0.7.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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",
|
||||||
|
"url": "git+https://github.com/juju/charm-helpers.git",
|
||||||
|
"branch": "refs/heads/stable/21.04",
|
||||||
|
"version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6",
|
||||||
|
"vcs": "git"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python_module",
|
||||||
|
"package": "wheel",
|
||||||
|
"vcs": null,
|
||||||
|
"version": "0.33.6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python_module",
|
||||||
|
"package": "charms.ceph",
|
||||||
|
"url": "git+https://github.com/openstack/charms.ceph.git",
|
||||||
|
"branch": "refs/heads/master",
|
||||||
|
"version": "9bfe43ee654d016d7f09ede406c45674821f2866",
|
||||||
|
"vcs": "git"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "python_module",
|
||||||
|
"package": "charms.reactive",
|
||||||
|
"vcs": null,
|
||||||
|
"version": "1.4.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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
|
keyring<21
|
||||||
|
|
||||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
# 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.git@stable/21.04#egg=zaza
|
||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack
|
||||||
|
@ -4,6 +4,6 @@ ceph_api
|
|||||||
pyxattr
|
pyxattr
|
||||||
psutil
|
psutil
|
||||||
|
|
||||||
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
|
nose>=1.3.7
|
||||||
coverage>=3.6
|
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:
|
# Revisit for removal / mock improvement:
|
||||||
netifaces # vault
|
netifaces # vault
|
||||||
|
7
tox.ini
7
tox.ini
@ -28,7 +28,12 @@ deps =
|
|||||||
[testenv:build]
|
[testenv:build]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands =
|
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]
|
[testenv:py3]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
Loading…
Reference in New Issue
Block a user