From f09fc6184b88a2fb3a019340d80d3795c50acc8d Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 3 May 2021 15:33:46 +0100 Subject: [PATCH] Updates to flip all libraries back to master This patchset updates all the requirements for charms.openstack, charm-helpers, charms.ceph, zaza and zaza-openstack-tests back to master branch. Change-Id: I0191fb810ae5eb8e7993cd0cb29464f79aeaefaa --- src/build.lock | 220 -------------------------------------- src/test-requirements.txt | 4 +- src/wheelhouse.txt | 4 +- test-requirements.txt | 2 +- 4 files changed, 5 insertions(+), 225 deletions(-) delete mode 100644 src/build.lock diff --git a/src/build.lock b/src/build.lock deleted file mode 100644 index 7fae38d..0000000 --- a/src/build.lock +++ /dev/null @@ -1,220 +0,0 @@ -{ - "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": "aodh", - "url": null, - "vcs": null, - "branch": "refs/heads/master", - "commit": "729c46410c69011a86529f1336cb201b8b58a2f6" - }, - { - "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": "layer", - "item": "interface:mongodb", - "url": "https://github.com/cloud-green/juju-relation-mongodb", - "vcs": null, - "branch": "refs/heads/master", - "commit": "708b6ade852794b17447024a28e5ec2bb883538c" - }, - { - "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" - } - ] -} \ No newline at end of file diff --git a/src/test-requirements.txt b/src/test-requirements.txt index eb4844b..520681e 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -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@stable/21.04#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 422c979..b060b4d 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -2,6 +2,6 @@ Jinja2<=2.10.1 psutil -git+https://opendev.org/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack -git+https://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 16bbc27..3f08524 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@stable/21.04#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack # # Revisit for removal / mock improvement: netifaces # vault