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: I62a00ed7b70cbf745dd1d4e6f67f45dd7cae6ebc
This commit is contained in:
Alex Kavanagh 2021-04-03 20:18:03 +01:00
parent 8ad5c4fefe
commit 6355573c90
6 changed files with 231 additions and 6 deletions

220
src/build.lock Normal file
View File

@ -0,0 +1,220 @@
{
"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:openstack-principle",
"url": "https://github.com/openstack/charm-layer-openstack-principle",
"vcs": null,
"branch": "refs/heads/master",
"commit": "8100de4b24ab361423363c75599124708169d871"
},
{
"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": "layer:leadership",
"url": "https://git.launchpad.net/layer-leadership",
"vcs": null,
"branch": "refs/heads/master",
"commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f"
},
{
"type": "layer",
"item": "magnum",
"url": null,
"vcs": null,
"branch": "refs/heads/master",
"commit": "8ad5c4fefec0c02c5c1feda8b38bdacfc2acfae5"
},
{
"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": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c"
},
{
"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": "a48a1e826ac0a74ab05a16c441cda4e4b34b1241"
},
{
"type": "layer",
"item": "interface:hacluster",
"url": "https://github.com/openstack/charm-interface-hacluster.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "6c611a3c61909fda411f7a79af53908ec7bef2c8"
},
{
"type": "layer",
"item": "interface:openstack-ha",
"url": "https://github.com/openstack/charm-interface-openstack-ha",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
},
{
"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": "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": "dnspython",
"vcs": null,
"version": "1.16.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.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"
}
]
}

0
src/files/.gitkeep Normal file
View File

View File

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

View File

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

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/21.04#egg=charms.openstack
#
# Revisit for removal / mock improvement:
netifaces # vault

View File

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