From 0a4c98f5c46797fe967641497cb07f27d337b922 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 15 Apr 2022 11:43:54 +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: I8f6d5f3f5f43138118a12eca6dddc19611575a7e --- src/build.lock | 182 ++++++++++++++++++++++++++++++++++++++ src/test-requirements.txt | 4 +- src/wheelhouse.txt | 2 +- test-requirements.txt | 2 +- 4 files changed, 186 insertions(+), 4 deletions(-) create mode 100644 src/build.lock diff --git a/src/build.lock b/src/build.lock new file mode 100644 index 0000000..da3e721 --- /dev/null +++ b/src/build.lock @@ -0,0 +1,182 @@ +{ + "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": "cinder-lvm", + "url": null, + "vcs": null, + "branch": "refs/heads/stable/yoga\nrefs/heads/yoga-updates", + "commit": "refs/heads/stable/yoga\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:cinder-backend", + "url": "https://github.com/openstack/charm-interface-cinder-backend.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "baa1b4f61ff610caf60a7b13841e8d68ce3842d1" + }, + { + "type": "python_module", + "package": "wheel", + "vcs": null, + "version": "0.37.1" + }, + { + "type": "python_module", + "package": "charms.openstack", + "url": "git+https://github.com/openstack/charms.openstack.git", + "branch": "refs/heads/master", + "version": "13ef220ce3529fa7b8e11c6e4c5b352d05b6f148", + "vcs": "git" + }, + { + "type": "python_module", + "package": "pyaml", + "vcs": null, + "version": "21.10.1" + }, + { + "type": "python_module", + "package": "MarkupSafe", + "vcs": null, + "version": "2.1.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": "pbr", + "vcs": null, + "version": "5.8.1" + }, + { + "type": "python_module", + "package": "pip", + "vcs": null, + "version": "22.0.4" + }, + { + "type": "python_module", + "package": "packaging", + "vcs": null, + "version": "21.3" + }, + { + "type": "python_module", + "package": "setuptools_scm", + "vcs": null, + "version": "6.4.2" + }, + { + "type": "python_module", + "package": "flit_core", + "vcs": null, + "version": "3.7.1" + }, + { + "type": "python_module", + "package": "setuptools", + "vcs": null, + "version": "62.1.0" + }, + { + "type": "python_module", + "package": "Jinja2", + "vcs": null, + "version": "3.1.1" + }, + { + "type": "python_module", + "package": "pyparsing", + "vcs": null, + "version": "3.0.8" + }, + { + "type": "python_module", + "package": "psutil", + "vcs": null, + "version": "5.9.0" + }, + { + "type": "python_module", + "package": "PyYAML", + "vcs": null, + "version": "5.3.1" + }, + { + "type": "python_module", + "package": "dnspython", + "vcs": null, + "version": "1.16.0" + }, + { + "type": "python_module", + "package": "Tempita", + "vcs": null, + "version": "0.4" + }, + { + "type": "python_module", + "package": "netifaces", + "vcs": null, + "version": "0.11.0" + }, + { + "type": "python_module", + "package": "charms.reactive", + "vcs": null, + "version": "1.5.0" + }, + { + "type": "python_module", + "package": "netaddr", + "vcs": null, + "version": "0.7.19" + }, + { + "type": "python_module", + "package": "tomli", + "vcs": null, + "version": "2.0.1" + } + ] +} \ No newline at end of file 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 7ea207d..3a3c845 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,3 +1,3 @@ #layer-basic uses wheelhouse to install python dependencies psutil -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: #