From 511d32309bacf62a3127361578c22ab4928635fe Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 14 Apr 2022 18:03:42 +0100 Subject: [PATCH] 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: I85ee9699991bb22c5a96055da7000d7729e582e6 --- .gitignore | 1 + .gitreview | 2 + src/build.lock | 222 ++++++++++++++++++++++++++++++++++++++ src/test-requirements.txt | 4 +- src/wheelhouse.txt | 6 +- test-requirements.txt | 2 +- 6 files changed, 231 insertions(+), 6 deletions(-) create mode 100644 src/build.lock diff --git a/.gitignore b/.gitignore index 018b270..231d85f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ __pycache__ *.pyc .idea .stestr +*.charm diff --git a/.gitreview b/.gitreview index 245b1ad..2f64c72 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-ceph-fs.git + +defaultbranch=stable/quincy diff --git a/src/build.lock b/src/build.lock new file mode 100644 index 0000000..bfdf4c3 --- /dev/null +++ b/src/build.lock @@ -0,0 +1,222 @@ +{ + "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": "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: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/stable/quincy\nrefs/heads/yoga-updates", + "commit": "refs/heads/stable/quincy\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:ceph-mds", + "url": "https://opendev.org/openstack/charm-interface-ceph-client.git", + "vcs": null, + "branch": "3ca251fb01a7cd51d2a0ee2b9b66647c8ffe891f", + "commit": "3ca251fb01a7cd51d2a0ee2b9b66647c8ffe891f" + }, + { + "type": "python_module", + "package": "tomli", + "vcs": null, + "version": "2.0.1" + }, + { + "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": "charms.openstack", + "url": "git+https://github.com/openstack/charms.openstack.git", + "branch": "refs/heads/stable/yoga", + "version": "13ef220ce3529fa7b8e11c6e4c5b352d05b6f148", + "vcs": "git" + }, + { + "type": "python_module", + "package": "pyxattr", + "vcs": null, + "version": "0.7.2" + }, + { + "type": "python_module", + "package": "wheel", + "vcs": null, + "version": "0.37.1" + }, + { + "type": "python_module", + "package": "ceph_api", + "vcs": null, + "version": "0.4.0" + }, + { + "type": "python_module", + "package": "Tempita", + "vcs": null, + "version": "0.4" + }, + { + "type": "python_module", + "package": "setuptools", + "vcs": null, + "version": "62.1.0" + }, + { + "type": "python_module", + "package": "setuptools_scm", + "vcs": null, + "version": "6.4.2" + }, + { + "type": "python_module", + "package": "pyaml", + "vcs": null, + "version": "21.10.1" + }, + { + "type": "python_module", + "package": "pip", + "vcs": null, + "version": "22.0.4" + }, + { + "type": "python_module", + "package": "MarkupSafe", + "vcs": null, + "version": "2.1.1" + }, + { + "type": "python_module", + "package": "netaddr", + "vcs": null, + "version": "0.7.19" + }, + { + "type": "python_module", + "package": "netifaces", + "vcs": null, + "version": "0.11.0" + }, + { + "type": "python_module", + "package": "psutil", + "vcs": null, + "version": "5.9.0" + }, + { + "type": "python_module", + "package": "charms.ceph", + "url": "git+https://github.com/openstack/charms.ceph.git", + "branch": "refs/heads/stable/yoga", + "version": "5745ed3ba856b34b0094cbc8e6aed312b142c019", + "vcs": "git" + }, + { + "type": "python_module", + "package": "PyYAML", + "vcs": null, + "version": "5.3.1" + }, + { + "type": "python_module", + "package": "six", + "vcs": null, + "version": "1.16.0" + }, + { + "type": "python_module", + "package": "charms.reactive", + "vcs": null, + "version": "1.5.0" + }, + { + "type": "python_module", + "package": "Jinja2", + "vcs": null, + "version": "3.1.1" + }, + { + "type": "python_module", + "package": "dnspython3", + "vcs": null, + "version": "1.15.0" + }, + { + "type": "python_module", + "package": "dnspython", + "vcs": null, + "version": "1.15.0" + }, + { + "type": "python_module", + "package": "pbr", + "vcs": null, + "version": "5.8.1" + }, + { + "type": "python_module", + "package": "pyparsing", + "vcs": null, + "version": "3.0.8" + }, + { + "type": "python_module", + "package": "flit_core", + "vcs": null, + "version": "3.7.1" + }, + { + "type": "python_module", + "package": "packaging", + "vcs": null, + "version": "21.3" + } + ] +} diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 9c7afb7..7c26a08 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -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 diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 303c396..253ca8e 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -4,8 +4,8 @@ ceph_api pyxattr 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/openstack/charms.ceph.git#egg=charms.ceph +git+https://github.com/openstack/charms.ceph.git@stable/yoga#egg=charms.ceph -git+https://github.com/juju/charm-helpers.git#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git@stable/yoga#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index a11a7d0..50eef16 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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: #