From 2390438e08f5d93d13f8ea85a66aeb52a622c6d1 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Tue, 17 Oct 2023 18:05:28 +0100 Subject: [PATCH] Updates for testing period for 23.10 release * charm-helpers sync for classic charms * build.lock file for reactive charms * ensure tox.ini is from release-tools * Locked requirements using pip-compile: * existing (test-)requirements.txt -> (test-)requirements.in * pip-compile to *-py3[8|10].txt using python3.8 and python3.10. * Updated tox.ini to use the appropriate merged requirements-*.txt files. * Removal of lunar from metadata, charmcraft.yaml osci.yaml, tests.yaml and associated bundles. * Locked libs and tests to stable/bobcat branches for: * charm-helpers * charms.openstack * zaza * zaza-openstack-tests Change-Id: Ieab7a30248a1248452061959b3c3c6b2ef8735fb --- .gitreview | 2 + charmcraft.yaml | 32 - merged-requirements-py310.txt | 203 ++++ merged-requirements-py38.txt | 211 +++++ osci.yaml | 20 +- requirements.txt => requirements.in | 0 src/build.lock | 890 ++++++++++++++++++ src/metadata.yaml | 1 - src/test-requirements-py38.txt | 659 +++++++++++++ ...-requirements.txt => test-requirements.in} | 4 +- src/tests/bundles/jammy-antelope-ha-ovn.yaml | 46 +- src/tests/bundles/jammy-antelope-ha.yaml | 42 +- src/tests/bundles/jammy-bobcat-ha-ovn.yaml | 46 +- src/tests/bundles/jammy-bobcat-ha.yaml | 42 +- src/tests/bundles/lunar-antelope-ha-ovn.yaml | 237 ----- src/tests/bundles/lunar-antelope-ha.yaml | 231 ----- src/tests/bundles/mantic-bobcat-ha-ovn.yaml | 46 +- src/tests/bundles/mantic-bobcat-ha.yaml | 42 +- src/tests/tests.yaml | 4 - src/tox.ini | 12 +- src/wheelhouse.txt | 4 +- test-requirements-py310.txt | 125 +++ test-requirements-py38.txt | 125 +++ test-requirements.txt => test-requirements.in | 2 +- tox.ini | 29 +- 25 files changed, 2370 insertions(+), 685 deletions(-) create mode 100644 merged-requirements-py310.txt create mode 100644 merged-requirements-py38.txt rename requirements.txt => requirements.in (100%) create mode 100644 src/build.lock create mode 100644 src/test-requirements-py38.txt rename src/{test-requirements.txt => test-requirements.in} (79%) delete mode 100644 src/tests/bundles/lunar-antelope-ha-ovn.yaml delete mode 100644 src/tests/bundles/lunar-antelope-ha.yaml create mode 100644 test-requirements-py310.txt create mode 100644 test-requirements-py38.txt rename test-requirements.txt => test-requirements.in (93%) diff --git a/.gitreview b/.gitreview index f4af0b17..67495889 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-octavia.git + +defaultbranch=stable/2023.2 diff --git a/charmcraft.yaml b/charmcraft.yaml index 8953fecd..8a74a74f 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -55,38 +55,6 @@ bases: - name: ubuntu channel: "22.04" architectures: [arm64] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [amd64] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [amd64] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [s390x] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [s390x] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [ppc64el] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [ppc64el] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [arm64] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [arm64] - build-on: - name: ubuntu channel: "23.10" diff --git a/merged-requirements-py310.txt b/merged-requirements-py310.txt new file mode 100644 index 00000000..bfafaeed --- /dev/null +++ b/merged-requirements-py310.txt @@ -0,0 +1,203 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --output-file=merged-requirements-py310.txt requirements.in test-requirements.in +# +attrs==23.1.0 + # via jsonschema +blessings==1.7 + # via charm-tools +certifi==2023.7.22 + # via requests +cffi==1.16.0 + # via cryptography +charm-tools @ git+https://github.com/juju/charm-tools.git + # via -r requirements.in +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/bobcat + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.1 + # via requests +cheetah3==3.2.6.post1 + # via charm-tools +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +colander==1.8.3 + # via charm-tools +coverage==7.3.2 + # via -r test-requirements.in +cryptography==3.3.2 + # via + # -r test-requirements.in + # pyopenssl + # secretstorage +dict2colander==0.2 + # via charm-tools +distlib==0.3.7 + # via virtualenv +extras==1.0.0 + # via stestr +filelock==3.12.4 + # via virtualenv +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.0.0 + # via -r test-requirements.in +idna==3.4 + # via requests +importlib-metadata==6.8.0 + # via keyring +iso8601==2.1.0 + # via + # colander + # python-subunit +jaraco-classes==3.3.0 + # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage +jinja2==3.1.2 + # via charmhelpers +jsonschema==4.17.3 + # via charm-tools +jujubundlelib==0.5.7 + # via charm-tools +keyring==23.13.1 + # via charm-tools +lxml==4.9.3 + # via -r test-requirements.in +markupsafe==2.1.3 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +more-itertools==10.1.0 + # via jaraco-classes +netaddr==0.9.0 + # via charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +otherstuf==1.1.0 + # via charm-tools +parse==1.19.1 + # via stuf +path==16.7.1 + # via path-py +path-py==12.5.0 + # via charm-tools +pathspec==0.10.3 + # via charm-tools +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +platformdirs==3.11.0 + # via virtualenv +prettytable==0.7.2 + # via cliff +psutil==5.9.6 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==23.9.7 + # via charms-reactive +pycparser==2.21 + # via cffi +pyopenssl==21.0.0 + # via -r test-requirements.in +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +pyrsistent==0.19.3 + # via jsonschema +python-subunit==1.4.3 + # via stestr +pyyaml==6.0.1 + # via + # charm-tools + # charmhelpers + # cliff + # jujubundlelib + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # charm-tools + # hvac +requirements-parser==0.5.0 + # via charm-tools +ruamel-yaml==0.17.40 + # via charm-tools +ruamel-yaml-clib==0.2.8 + # via ruamel-yaml +secretstorage==3.3.3 + # via + # charm-tools + # keyring +simplejson==3.19.2 + # via -r requirements.in +six==1.16.0 + # via + # blessings + # cliff + # cmd2 + # cryptography + # fixtures + # pyopenssl +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.1.0 + # via cliff +stuf==0.9.16 + # via otherstuf +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.6.0 + # via + # fixtures + # python-subunit + # stestr +tomlkit==0.12.1 + # via stestr +translationstring==1.4 + # via colander +types-setuptools==68.2.0.0 + # via requirements-parser +urllib3==2.0.7 + # via requests +vergit==1.0.2 + # via charm-tools +virtualenv==20.24.6 + # via charm-tools +voluptuous==0.13.1 + # via stestr +wcwidth==0.2.8 + # via cmd2 +zipp==3.17.0 + # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/merged-requirements-py38.txt b/merged-requirements-py38.txt new file mode 100644 index 00000000..319edefa --- /dev/null +++ b/merged-requirements-py38.txt @@ -0,0 +1,211 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --output-file=merged-requirements-py38.txt requirements.in test-requirements.in +# +attrs==23.1.0 + # via jsonschema +blessings==1.7 + # via charm-tools +certifi==2023.7.22 + # via requests +cffi==1.16.0 + # via cryptography +charm-tools @ git+https://github.com/juju/charm-tools.git + # via -r requirements.in +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/bobcat + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.1 + # via requests +cheetah3==3.2.6.post1 + # via charm-tools +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +colander==1.8.3 + # via charm-tools +coverage==7.3.2 + # via -r test-requirements.in +cryptography==3.3.2 + # via + # -r test-requirements.in + # pyopenssl + # secretstorage +dict2colander==0.2 + # via charm-tools +distlib==0.3.7 + # via virtualenv +extras==1.0.0 + # via stestr +filelock==3.12.4 + # via virtualenv +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.0.0 + # via -r test-requirements.in +idna==3.4 + # via requests +importlib-metadata==6.8.0 + # via keyring +importlib-resources==6.1.0 + # via + # jsonschema + # keyring +iso8601==2.1.0 + # via + # colander + # python-subunit +jaraco-classes==3.3.0 + # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage +jinja2==3.1.2 + # via charmhelpers +jsonschema==4.17.3 + # via charm-tools +jujubundlelib==0.5.7 + # via charm-tools +keyring==23.13.1 + # via charm-tools +lxml==4.9.3 + # via -r test-requirements.in +markupsafe==2.1.3 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +more-itertools==10.1.0 + # via jaraco-classes +netaddr==0.9.0 + # via charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +otherstuf==1.1.0 + # via charm-tools +parse==1.19.1 + # via stuf +path==16.7.1 + # via path-py +path-py==12.5.0 + # via charm-tools +pathspec==0.10.3 + # via charm-tools +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +pkgutil-resolve-name==1.3.10 + # via jsonschema +platformdirs==3.11.0 + # via virtualenv +prettytable==0.7.2 + # via cliff +psutil==5.9.6 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==23.9.7 + # via charms-reactive +pycparser==2.21 + # via cffi +pyopenssl==21.0.0 + # via -r test-requirements.in +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +pyrsistent==0.19.3 + # via jsonschema +python-subunit==1.4.3 + # via stestr +pyyaml==6.0.1 + # via + # charm-tools + # charmhelpers + # cliff + # jujubundlelib + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # charm-tools + # hvac +requirements-parser==0.5.0 + # via charm-tools +ruamel-yaml==0.17.40 + # via charm-tools +ruamel-yaml-clib==0.2.8 + # via ruamel-yaml +secretstorage==3.3.3 + # via + # charm-tools + # keyring +simplejson==3.19.2 + # via -r requirements.in +six==1.16.0 + # via + # blessings + # cliff + # cmd2 + # cryptography + # fixtures + # pyopenssl +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.1.0 + # via cliff +stuf==0.9.16 + # via otherstuf +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.6.0 + # via + # fixtures + # python-subunit + # stestr +tomlkit==0.12.1 + # via stestr +translationstring==1.4 + # via colander +types-setuptools==68.2.0.0 + # via requirements-parser +urllib3==2.0.7 + # via requests +vergit==1.0.2 + # via charm-tools +virtualenv==20.24.6 + # via charm-tools +voluptuous==0.13.1 + # via stestr +wcwidth==0.2.8 + # via cmd2 +zipp==3.17.0 + # via + # importlib-metadata + # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/osci.yaml b/osci.yaml index 0bc73331..2ea470be 100644 --- a/osci.yaml +++ b/osci.yaml @@ -9,10 +9,6 @@ voting: false - jammy-bobcat-ha-ovn: voting: false - - lunar-antelope-ha: - voting: false - - lunar-antelope-ha-ovn: - voting: false - mantic-bobcat-ha: voting: false - mantic-bobcat-ha-ovn: @@ -21,7 +17,7 @@ needs_charm_build: true charm_build_name: octavia build_type: charmcraft - charmcraft_channel: 2.x/edge + charmcraft_channel: 2.x/stable - job: name: jammy-antelope-ha @@ -54,20 +50,6 @@ - jammy-antelope-ha vars: tox_extra_args: '-- jammy-bobcat-ha-ovn' -- job: - name: lunar-bobcat-ha - parent: func-target - dependencies: - - jammy-antelope-ha - vars: - tox_extra_args: '-- lunar-bobcat-ha' -- job: - name: lunar-bobcat-ha-ovn - parent: func-target - dependencies: - - jammy-antelope-ha - vars: - tox_extra_args: '-- lunar-bobcat-ha-ovn' - job: name: mantic-bobcat-ha parent: func-target diff --git a/requirements.txt b/requirements.in similarity index 100% rename from requirements.txt rename to requirements.in diff --git a/src/build.lock b/src/build.lock new file mode 100644 index 00000000..efa1403b --- /dev/null +++ b/src/build.lock @@ -0,0 +1,890 @@ +{ + "locks": [ + { + "type": "layer", + "item": "layer:leadership", + "url": "https://git.launchpad.net/layer-leadership", + "vcs": null, + "branch": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f", + "commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f" + }, + { + "type": "layer", + "item": "layer:options", + "url": "https://github.com/juju-solutions/layer-options.git", + "vcs": null, + "branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56", + "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56" + }, + { + "type": "layer", + "item": "layer:basic", + "url": "https://github.com/juju-solutions/layer-basic.git", + "vcs": null, + "branch": "23e978fe2872c30511f34ad30a284e34f800e20f", + "commit": "23e978fe2872c30511f34ad30a284e34f800e20f" + }, + { + "type": "layer", + "item": "layer:openstack", + "url": "https://github.com/openstack/charm-layer-openstack", + "vcs": null, + "branch": "1c9e662d78b328c6d4587171ccba08572e8dcf25", + "commit": "1c9e662d78b328c6d4587171ccba08572e8dcf25" + }, + { + "type": "layer", + "item": "layer:openstack-principle", + "url": "https://github.com/openstack/charm-layer-openstack-principle", + "vcs": null, + "branch": "2541283a7f9c3fa923c0fccd7257e217e11dadcd", + "commit": "2541283a7f9c3fa923c0fccd7257e217e11dadcd" + }, + { + "type": "layer", + "item": "layer:openstack-api", + "url": "https://github.com/openstack/charm-layer-openstack-api", + "vcs": null, + "branch": "34311a62e963d0ce903b7ddb9d70b8f071f71651", + "commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651" + }, + { + "type": "layer", + "item": "octavia", + "url": null, + "vcs": null, + "branch": null, + "commit": "" + }, + { + "type": "layer", + "item": "interface:tls-certificates", + "url": "https://github.com/juju-solutions/interface-tls-certificates", + "vcs": null, + "branch": "3056e1fbc5164190c135b20579ab31c89af0b132", + "commit": "3056e1fbc5164190c135b20579ab31c89af0b132" + }, + { + "type": "layer", + "item": "interface:mysql-shared", + "url": "https://github.com/openstack/charm-interface-mysql-shared", + "vcs": null, + "branch": "f90f8c6edce21e4da3a872f0f9d6761730ce025d", + "commit": "f90f8c6edce21e4da3a872f0f9d6761730ce025d" + }, + { + "type": "layer", + "item": "interface:rabbitmq", + "url": "https://github.com/openstack/charm-interface-rabbitmq", + "vcs": null, + "branch": "383121fc584d2d3bf9d233eba0d3708398a4c468", + "commit": "383121fc584d2d3bf9d233eba0d3708398a4c468" + }, + { + "type": "layer", + "item": "interface:keystone", + "url": "https://github.com/openstack/charm-interface-keystone", + "vcs": null, + "branch": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a", + "commit": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a" + }, + { + "type": "layer", + "item": "interface:hacluster", + "url": "https://github.com/openstack/charm-interface-hacluster.git", + "vcs": null, + "branch": "5fc5216f51dcf98530d45e137d55fd94b39d150a", + "commit": "5fc5216f51dcf98530d45e137d55fd94b39d150a" + }, + { + "type": "layer", + "item": "interface:openstack-ha", + "url": "https://github.com/openstack/charm-interface-openstack-ha", + "vcs": null, + "branch": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80", + "commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80" + }, + { + "type": "layer", + "item": "interface:neutron-load-balancer", + "url": "https://github.com/openstack/charm-interface-neutron-load-balancer.git", + "vcs": null, + "branch": "232bf9bad4536ea20f26831b6a31b55b778315d9", + "commit": "232bf9bad4536ea20f26831b6a31b55b778315d9" + }, + { + "type": "layer", + "item": "interface:neutron-plugin", + "url": "https://github.com/openstack/charm-interface-neutron-plugin", + "vcs": null, + "branch": "3fba729d3e2856a9cab4de71c1252388213b9844", + "commit": "3fba729d3e2856a9cab4de71c1252388213b9844" + }, + { + "type": "layer", + "item": "interface:ovsdb-subordinate", + "url": "https://opendev.org/x/charm-interface-ovsdb.git", + "vcs": null, + "branch": "9eb098b23dab04173b3aabc9c65b0b0f6622b6d8", + "commit": "9eb098b23dab04173b3aabc9c65b0b0f6622b6d8" + }, + { + "type": "layer", + "item": "interface:ovsdb-cms", + "url": "https://opendev.org/x/charm-interface-ovsdb.git", + "vcs": null, + "branch": "9eb098b23dab04173b3aabc9c65b0b0f6622b6d8", + "commit": "9eb098b23dab04173b3aabc9c65b0b0f6622b6d8" + }, + { + "type": "layer", + "item": "interface:nrpe-external-master", + "url": "https://github.com/canonical/nrpe-external-master-interface", + "vcs": null, + "branch": "c58fe7b01a151d933681b5bf67e47ad3de65eeaa", + "commit": "c58fe7b01a151d933681b5bf67e47ad3de65eeaa" + }, + { + "type": "python_module", + "package": "setuptools", + "vcs": null, + "version": "62.1.0" + }, + { + "type": "python_module", + "package": "appdirs", + "vcs": null, + "version": "1.4.4" + }, + { + "type": "python_module", + "package": "setproctitle", + "vcs": null, + "version": "1.3.3" + }, + { + "type": "python_module", + "package": "PyYAML", + "vcs": null, + "version": "6.0.1" + }, + { + "type": "python_module", + "package": "cmd2", + "vcs": null, + "version": "2.4.3" + }, + { + "type": "python_module", + "package": "six", + "vcs": null, + "version": "1.16.0" + }, + { + "type": "python_module", + "package": "oslo.serialization", + "vcs": null, + "version": "5.2.0" + }, + { + "type": "python_module", + "package": "iso8601", + "vcs": null, + "version": "2.1.0" + }, + { + "type": "python_module", + "package": "zipp", + "vcs": null, + "version": "3.17.0" + }, + { + "type": "python_module", + "package": "dnspython", + "vcs": null, + "version": "2.4.2" + }, + { + "type": "python_module", + "package": "simplejson", + "vcs": null, + "version": "3.19.2" + }, + { + "type": "python_module", + "package": "Tempita", + "vcs": null, + "version": "0.4" + }, + { + "type": "python_module", + "package": "Mako", + "vcs": null, + "version": "1.2.4" + }, + { + "type": "python_module", + "package": "alembic", + "vcs": null, + "version": "1.12.0" + }, + { + "type": "python_module", + "package": "debtcollector", + "vcs": null, + "version": "2.5.0" + }, + { + "type": "python_module", + "package": "flit_scm", + "vcs": null, + "version": "1.7.0" + }, + { + "type": "python_module", + "package": "tomli", + "vcs": null, + "version": "2.0.1" + }, + { + "type": "python_module", + "package": "psutil", + "vcs": null, + "version": "5.9.6" + }, + { + "type": "python_module", + "package": "charmhelpers", + "url": "git+https://github.com/juju/charm-helpers.git", + "branch": "stable/bobcat", + "version": "fb4c77601caed98e029811dcb7970f5f36d37042", + "vcs": "git" + }, + { + "type": "python_module", + "package": "oslo.concurrency", + "vcs": null, + "version": "5.2.0" + }, + { + "type": "python_module", + "package": "oslo.messaging", + "vcs": null, + "version": "14.4.1" + }, + { + "type": "python_module", + "package": "wrapt", + "vcs": null, + "version": "1.15.0" + }, + { + "type": "python_module", + "package": "decorator", + "vcs": null, + "version": "5.1.1" + }, + { + "type": "python_module", + "package": "amqp", + "vcs": null, + "version": "5.1.1" + }, + { + "type": "python_module", + "package": "pyparsing", + "vcs": null, + "version": "3.1.1" + }, + { + "type": "python_module", + "package": "oslo.config", + "vcs": null, + "version": "9.2.0" + }, + { + "type": "python_module", + "package": "os-service-types", + "vcs": null, + "version": "1.7.0" + }, + { + "type": "python_module", + "package": "os-ken", + "vcs": null, + "version": "2.7.0" + }, + { + "type": "python_module", + "package": "Paste", + "vcs": null, + "version": "3.6.1" + }, + { + "type": "python_module", + "package": "sniffio", + "vcs": null, + "version": "1.3.0" + }, + { + "type": "python_module", + "package": "wheel", + "vcs": null, + "version": "0.41.2" + }, + { + "type": "python_module", + "package": "pycparser", + "vcs": null, + "version": "2.21" + }, + { + "type": "python_module", + "package": "oslo.middleware", + "vcs": null, + "version": "5.2.0" + }, + { + "type": "python_module", + "package": "lxml", + "vcs": null, + "version": "4.9.3" + }, + { + "type": "python_module", + "package": "oslo.log", + "vcs": null, + "version": "5.3.0" + }, + { + "type": "python_module", + "package": "paramiko", + "vcs": null, + "version": "3.3.1" + }, + { + "type": "python_module", + "package": "typing_extensions", + "vcs": null, + "version": "4.8.0" + }, + { + "type": "python_module", + "package": "pyinotify", + "vcs": null, + "version": "0.9.6" + }, + { + "type": "python_module", + "package": "poetry_core", + "vcs": null, + "version": "1.7.0" + }, + { + "type": "python_module", + "package": "kombu", + "vcs": null, + "version": "5.3.2" + }, + { + "type": "python_module", + "package": "prettytable", + "vcs": null, + "version": "3.9.0" + }, + { + "type": "python_module", + "package": "oslo.service", + "vcs": null, + "version": "3.2.0" + }, + { + "type": "python_module", + "package": "os-client-config", + "vcs": null, + "version": "2.1.0" + }, + { + "type": "python_module", + "package": "anyio", + "vcs": null, + "version": "3.6.2" + }, + { + "type": "python_module", + "package": "charms.openstack", + "url": "git+https://github.com/openstack/charms.openstack.git", + "branch": "stable/bobcat", + "version": "70f9e32f057938d8ad5e01da20eabb83d3d34847", + "vcs": "git" + }, + { + "type": "python_module", + "package": "prometheus_client", + "vcs": null, + "version": "0.17.1" + }, + { + "type": "python_module", + "package": "certifi", + "vcs": null, + "version": "2023.7.22" + }, + { + "type": "python_module", + "package": "python-novaclient", + "vcs": null, + "version": "18.4.0" + }, + { + "type": "python_module", + "package": "python-dateutil", + "vcs": null, + "version": "2.8.2" + }, + { + "type": "python_module", + "package": "netifaces", + "vcs": null, + "version": "0.11.0" + }, + { + "type": "python_module", + "package": "python-keystoneclient", + "vcs": null, + "version": "5.2.0" + }, + { + "type": "python_module", + "package": "oslo.versionedobjects", + "vcs": null, + "version": "3.2.0" + }, + { + "type": "python_module", + "package": "futurist", + "vcs": null, + "version": "2.4.1" + }, + { + "type": "python_module", + "package": "testresources", + "vcs": null, + "version": "2.0.1" + }, + { + "type": "python_module", + "package": "PyNaCl", + "vcs": null, + "version": "1.5.0" + }, + { + "type": "python_module", + "package": "osprofiler", + "vcs": null, + "version": "4.1.0" + }, + { + "type": "python_module", + "package": "eventlet", + "vcs": null, + "version": "0.33.3" + }, + { + "type": "python_module", + "package": "ovs", + "vcs": null, + "version": "3.1.2" + }, + { + "type": "python_module", + "package": "attrs", + "vcs": null, + "version": "23.1.0" + }, + { + "type": "python_module", + "package": "wcwidth", + "vcs": null, + "version": "0.2.8" + }, + { + "type": "python_module", + "package": "neutron-lib", + "vcs": null, + "version": "3.8.0" + }, + { + "type": "python_module", + "package": "oslo.db", + "vcs": null, + "version": "14.1.0" + }, + { + "type": "python_module", + "package": "bcrypt", + "vcs": null, + "version": "4.0.1" + }, + { + "type": "python_module", + "package": "pbr", + "vcs": null, + "version": "5.11.1" + }, + { + "type": "python_module", + "package": "Routes", + "vcs": null, + "version": "2.5.1" + }, + { + "type": "python_module", + "package": "keystoneauth1", + "vcs": null, + "version": "5.3.0" + }, + { + "type": "python_module", + "package": "cryptography", + "vcs": null, + "version": "41.0.4" + }, + { + "type": "python_module", + "package": "sortedcontainers", + "vcs": null, + "version": "2.4.0" + }, + { + "type": "python_module", + "package": "PasteDeploy", + "vcs": null, + "version": "3.0.1" + }, + { + "type": "python_module", + "package": "testscenarios", + "vcs": null, + "version": "0.5.0" + }, + { + "type": "python_module", + "package": "requestsexceptions", + "vcs": null, + "version": "1.4.0" + }, + { + "type": "python_module", + "package": "tzdata", + "vcs": null, + "version": "2023.3" + }, + { + "type": "python_module", + "package": "statsd", + "vcs": null, + "version": "4.0.1" + }, + { + "type": "python_module", + "package": "flit_core", + "vcs": null, + "version": "3.9.0" + }, + { + "type": "python_module", + "package": "WebOb", + "vcs": null, + "version": "1.8.7" + }, + { + "type": "python_module", + "package": "oslo.utils", + "vcs": null, + "version": "6.2.1" + }, + { + "type": "python_module", + "package": "Jinja2", + "vcs": null, + "version": "3.1.2" + }, + { + "type": "python_module", + "package": "fasteners", + "vcs": null, + "version": "0.19" + }, + { + "type": "python_module", + "package": "osc-lib", + "vcs": null, + "version": "2.8.1" + }, + { + "type": "python_module", + "package": "Cython", + "vcs": null, + "version": "0.29.36" + }, + { + "type": "python_module", + "package": "jsonpointer", + "vcs": null, + "version": "2.4" + }, + { + "type": "python_module", + "package": "jmespath", + "vcs": null, + "version": "1.0.1" + }, + { + "type": "python_module", + "package": "os-traits", + "vcs": null, + "version": "3.0.0" + }, + { + "type": "python_module", + "package": "pecan", + "vcs": null, + "version": "1.5.1" + }, + { + "type": "python_module", + "package": "msgpack", + "vcs": null, + "version": "1.0.7" + }, + { + "type": "python_module", + "package": "fixtures", + "vcs": null, + "version": "4.1.0" + }, + { + "type": "python_module", + "package": "oslo.metrics", + "vcs": null, + "version": "0.7.0" + }, + { + "type": "python_module", + "package": "python-neutronclient", + "vcs": null, + "version": "11.0.0" + }, + { + "type": "python_module", + "package": "oslo.i18n", + "vcs": null, + "version": "6.1.0" + }, + { + "type": "python_module", + "package": "MarkupSafe", + "vcs": null, + "version": "2.1.3" + }, + { + "type": "python_module", + "package": "SQLAlchemy", + "vcs": null, + "version": "2.0.22" + }, + { + "type": "python_module", + "package": "repoze.lru", + "vcs": null, + "version": "0.7" + }, + { + "type": "python_module", + "package": "pyaml", + "vcs": null, + "version": "21.10.1" + }, + { + "type": "python_module", + "package": "oslo.context", + "vcs": null, + "version": "5.2.0" + }, + { + "type": "python_module", + "package": "yappi", + "vcs": null, + "version": "1.4.0" + }, + { + "type": "python_module", + "package": "setuptools_scm", + "vcs": null, + "version": "6.4.2" + }, + { + "type": "python_module", + "package": "urllib3", + "vcs": null, + "version": "2.0.6" + }, + { + "type": "python_module", + "package": "charms.reactive", + "vcs": null, + "version": "1.5.2" + }, + { + "type": "python_module", + "package": "logutils", + "vcs": null, + "version": "0.3.5" + }, + { + "type": "python_module", + "package": "autopage", + "vcs": null, + "version": "0.5.2" + }, + { + "type": "python_module", + "package": "cliff", + "vcs": null, + "version": "4.3.0" + }, + { + "type": "python_module", + "package": "vine", + "vcs": null, + "version": "5.0.0" + }, + { + "type": "python_module", + "package": "tenacity", + "vcs": null, + "version": "8.2.3" + }, + { + "type": "python_module", + "package": "pytz", + "vcs": null, + "version": "2023.3.post1" + }, + { + "type": "python_module", + "package": "stevedore", + "vcs": null, + "version": "5.1.0" + }, + { + "type": "python_module", + "package": "pip", + "vcs": null, + "version": "22.0.4" + }, + { + "type": "python_module", + "package": "idna", + "vcs": null, + "version": "3.4" + }, + { + "type": "python_module", + "package": "rfc3986", + "vcs": null, + "version": "2.0.0" + }, + { + "type": "python_module", + "package": "pyperclip", + "vcs": null, + "version": "1.8.2" + }, + { + "type": "python_module", + "package": "cachetools", + "vcs": null, + "version": "5.3.1" + }, + { + "type": "python_module", + "package": "cffi", + "vcs": null, + "version": "1.16.0" + }, + { + "type": "python_module", + "package": "testtools", + "vcs": null, + "version": "2.6.0" + }, + { + "type": "python_module", + "package": "ncclient", + "vcs": null, + "version": "0.6.13" + }, + { + "type": "python_module", + "package": "packaging", + "vcs": null, + "version": "23.2" + }, + { + "type": "python_module", + "package": "importlib_metadata", + "vcs": null, + "version": "6.8.0" + }, + { + "type": "python_module", + "package": "requests", + "vcs": null, + "version": "2.31.0" + }, + { + "type": "python_module", + "package": "charset-normalizer", + "vcs": null, + "version": "3.3.0" + }, + { + "type": "python_module", + "package": "dogpile.cache", + "vcs": null, + "version": "1.2.2" + }, + { + "type": "python_module", + "package": "jsonpatch", + "vcs": null, + "version": "1.33" + }, + { + "type": "python_module", + "package": "netaddr", + "vcs": null, + "version": "0.7.19" + }, + { + "type": "python_module", + "package": "greenlet", + "vcs": null, + "version": "3.0.0" + }, + { + "type": "python_module", + "package": "oslo.policy", + "vcs": null, + "version": "4.2.1" + }, + { + "type": "python_module", + "package": "openstacksdk", + "vcs": null, + "version": "1.5.0" + } + ] +} \ No newline at end of file diff --git a/src/metadata.yaml b/src/metadata.yaml index a423d2fc..756a7470 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -20,7 +20,6 @@ tags: - openstack series: - jammy -- lunar - mantic subordinate: false provides: diff --git a/src/test-requirements-py38.txt b/src/test-requirements-py38.txt new file mode 100644 index 00000000..352d6c0c --- /dev/null +++ b/src/test-requirements-py38.txt @@ -0,0 +1,659 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --output-file=src/test-requirements-py38.txt src/test-requirements.in +# +aiohttp==3.8.6 + # via + # python-libmaas + # zaza +aiosignal==1.3.1 + # via aiohttp +aodhclient==3.3.0 + # via zaza-openstack +appdirs==1.4.4 + # via python-ironicclient +argcomplete==3.1.2 + # via python-libmaas +async-generator==1.10 + # via + # zaza + # zaza-openstack +async-timeout==4.0.3 + # via aiohttp +attrs==23.1.0 + # via + # aiohttp + # cmd2 + # jsonschema + # referencing +autopage==0.5.2 + # via cliff +babel==2.13.1 + # via + # python-cinderclient + # python-heatclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient +bcrypt==4.0.1 + # via paramiko +boto3==1.28.70 + # via zaza-openstack +botocore==1.31.70 + # via + # boto3 + # s3transfer +cachetools==5.3.2 + # via google-auth +certifi==2023.7.22 + # via + # kubernetes + # requests +cffi==1.16.0 + # via + # cryptography + # pynacl +charset-normalizer==3.3.1 + # via + # aiohttp + # requests +cliff==4.3.0 + # via + # aodhclient + # gnocchiclient + # osc-lib + # python-barbicanclient + # python-cloudkittyclient + # python-designateclient + # python-heatclient + # python-ironicclient + # python-neutronclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient +cmd2==2.4.3 + # via cliff +colorclass==2.2.2 + # via python-libmaas +cryptography==3.3.2 + # via + # openstacksdk + # paramiko + # pyopenssl + # python-magnumclient + # trustme + # zaza + # zaza-openstack +debtcollector==2.5.0 + # via + # gnocchiclient + # oslo-config + # oslo-context + # oslo-log + # oslo-utils + # python-designateclient + # python-keystoneclient + # python-manilaclient + # python-neutronclient +decorator==5.1.1 + # via + # dogpile-cache + # jsonpath-rw + # openstacksdk + # python-magnumclient +dnspython==2.4.2 + # via + # pymongo + # zaza-openstack +dogpile-cache==1.2.2 + # via + # openstacksdk + # python-ironicclient +fasteners==0.19 + # via oslo-concurrency +frozenlist==1.4.0 + # via + # aiohttp + # aiosignal +futurist==1.10.0 + # via + # gnocchiclient + # zaza-openstack +gnocchiclient==7.0.8 + # via zaza-openstack +google-auth==2.23.3 + # via kubernetes +hvac==0.6.4 + # via + # zaza + # zaza-openstack +idna==3.4 + # via + # requests + # trustme + # yarl +importlib-metadata==6.8.0 + # via cliff +importlib-resources==6.1.0 + # via + # jsonschema + # jsonschema-specifications +iso8601==2.1.0 + # via + # gnocchiclient + # keystoneauth1 + # openstacksdk + # oslo-utils + # python-ceilometerclient + # python-heatclient + # python-neutronclient + # python-novaclient +jinja2==3.1.2 + # via + # zaza + # zaza-openstack +jmespath==1.0.1 + # via + # boto3 + # botocore + # openstacksdk +jsonpatch==1.33 + # via + # openstacksdk + # warlock +jsonpath-rw==1.4.0 + # via jsonpath-rw-ext +jsonpath-rw-ext==1.2.2 + # via python-cloudkittyclient +jsonpointer==2.4 + # via jsonpatch +jsonschema==4.19.1 + # via + # python-designateclient + # python-ironicclient + # warlock +jsonschema-specifications==2023.7.1 + # via jsonschema +juju==2.9.44.1 + # via zaza +juju-wait==2.8.4 + # via zaza +jujubundlelib==0.5.7 + # via theblues +keystoneauth1==5.3.0 + # via + # aodhclient + # gnocchiclient + # openstacksdk + # osc-lib + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-cloudkittyclient + # python-designateclient + # python-glanceclient + # python-heatclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient +kubernetes==28.1.0 + # via juju +lxml==4.9.3 + # via zaza-openstack +macaroonbakery==1.3.1 + # via + # juju + # python-libmaas + # theblues +markupsafe==2.1.3 + # via jinja2 +msgpack==1.0.7 + # via oslo-serialization +multidict==6.0.4 + # via + # aiohttp + # yarl +mypy-extensions==1.0.0 + # via typing-inspect +netaddr==0.9.0 + # via + # oslo-config + # oslo-utils + # osprofiler + # python-neutronclient +netifaces==0.11.0 + # via + # openstacksdk + # oslo-utils + # python-octaviaclient +oauthlib==3.2.2 + # via + # kubernetes + # python-libmaas + # requests-oauthlib +openstacksdk==2.0.0 + # via + # os-client-config + # osc-lib + # python-ironicclient + # python-openstackclient +os-client-config==2.1.0 + # via + # python-cloudkittyclient + # python-magnumclient + # python-neutronclient +os-service-types==1.7.0 + # via + # keystoneauth1 + # openstacksdk +osc-lib==2.8.1 + # via + # aodhclient + # python-cloudkittyclient + # python-designateclient + # python-heatclient + # python-ironicclient + # python-magnumclient + # python-neutronclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient +oslo-concurrency==5.2.0 + # via osprofiler +oslo-config==6.11.3 + # via + # oslo-concurrency + # oslo-log + # python-keystoneclient + # python-manilaclient + # zaza + # zaza-openstack +oslo-context==5.2.0 + # via oslo-log +oslo-i18n==6.1.0 + # via + # aodhclient + # osc-lib + # oslo-concurrency + # oslo-config + # oslo-log + # oslo-utils + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-glanceclient + # python-heatclient + # python-keystoneclient + # python-magnumclient + # python-neutronclient + # python-novaclient + # python-openstackclient + # python-watcherclient +oslo-log==5.3.0 + # via + # python-cloudkittyclient + # python-magnumclient + # python-manilaclient + # python-neutronclient +oslo-serialization==5.2.0 + # via + # aodhclient + # oslo-log + # osprofiler + # python-barbicanclient + # python-ceilometerclient + # python-designateclient + # python-heatclient + # python-keystoneclient + # python-magnumclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-watcherclient +oslo-utils==6.2.1 + # via + # aodhclient + # osc-lib + # oslo-concurrency + # oslo-log + # oslo-serialization + # osprofiler + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-cloudkittyclient + # python-designateclient + # python-glanceclient + # python-heatclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient +osprofiler==4.1.0 + # via aodhclient +packaging==23.2 + # via oslo-utils +paramiko==2.12.0 + # via juju +pbr==5.11.1 + # via + # aodhclient + # futurist + # jsonpath-rw-ext + # keystoneauth1 + # openstacksdk + # os-service-types + # osc-lib + # oslo-concurrency + # oslo-context + # oslo-i18n + # oslo-log + # oslo-serialization + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-cloudkittyclient + # python-designateclient + # python-glanceclient + # python-heatclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient + # stevedore +pika==1.3.2 + # via zaza-openstack +pkgutil-resolve-name==1.3.10 + # via jsonschema +platformdirs==3.11.0 + # via openstacksdk +ply==3.11 + # via jsonpath-rw +prettytable==0.7.2 + # via + # cliff + # futurist + # osprofiler + # python-ceilometerclient + # python-cinderclient + # python-glanceclient + # python-heatclient + # python-magnumclient + # python-manilaclient + # python-novaclient +protobuf==3.20.3 + # via macaroonbakery +pyasn1==0.5.0 + # via + # juju + # pyasn1-modules + # rsa +pyasn1-modules==0.3.0 + # via google-auth +pycparser==2.21 + # via cffi +pyinotify==0.9.6 + # via oslo-log +pymacaroons==0.13.0 + # via macaroonbakery +pymongo==4.5.0 + # via python-libmaas +pynacl==1.5.0 + # via + # macaroonbakery + # paramiko + # pymacaroons +pyopenssl==21.0.0 + # via + # python-glanceclient + # zaza-openstack +pyparsing==3.1.1 + # via + # aodhclient + # oslo-utils +pyperclip==1.8.2 + # via cmd2 +pyrfc3339==1.1 + # via + # juju + # macaroonbakery +python-barbicanclient==4.10.0 + # via zaza-openstack +python-ceilometerclient==2.9.0 + # via zaza-openstack +python-cinderclient==5.0.2 + # via + # python-openstackclient + # zaza-openstack +python-cloudkittyclient==4.8.0 + # via zaza-openstack +python-dateutil==2.8.2 + # via + # botocore + # gnocchiclient + # kubernetes + # oslo-log +python-designateclient==2.12.0 + # via zaza-openstack +python-glanceclient==4.4.0 + # via + # python-openstackclient + # zaza-openstack +python-heatclient==1.18.1 + # via zaza-openstack +python-ironicclient==5.4.0 + # via zaza-openstack +python-keystoneclient==3.21.0 + # via + # python-manilaclient + # python-neutronclient + # python-openstackclient + # zaza-openstack +python-libmaas==0.6.8 + # via zaza +python-magnumclient==4.2.0 + # via zaza-openstack +python-manilaclient==1.29.0 + # via zaza-openstack +python-neutronclient==6.14.1 + # via + # python-octaviaclient + # zaza-openstack +python-novaclient==15.1.1 + # via + # python-openstackclient + # zaza-openstack +python-octaviaclient==1.10.1 + # via zaza-openstack +python-openstackclient==4.0.2 + # via python-octaviaclient +python-swiftclient==3.8.1 + # via + # python-heatclient + # zaza-openstack +python-watcherclient==4.2.0 + # via zaza-openstack +pytz==2023.3.post1 + # via + # babel + # oslo-serialization + # oslo-utils + # pyrfc3339 + # python-libmaas +pyyaml==6.0.1 + # via + # cliff + # juju + # juju-wait + # jujubundlelib + # kubernetes + # openstacksdk + # oslo-config + # python-cloudkittyclient + # python-heatclient + # python-ironicclient + # python-libmaas + # python-watcherclient + # zaza + # zaza-openstack +referencing==0.30.2 + # via + # jsonschema + # jsonschema-specifications +requests==2.31.0 + # via + # hvac + # keystoneauth1 + # kubernetes + # macaroonbakery + # oslo-config + # osprofiler + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-designateclient + # python-glanceclient + # python-heatclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient + # python-manilaclient + # python-neutronclient + # python-octaviaclient + # python-swiftclient + # requests-oauthlib + # theblues +requests-oauthlib==1.3.1 + # via kubernetes +requestsexceptions==1.4.0 + # via openstacksdk +rfc3986==2.0.0 + # via oslo-config +rpds-py==0.10.6 + # via + # jsonschema + # referencing +rsa==4.9 + # via google-auth +s3transfer==0.7.0 + # via boto3 +simplejson==3.19.2 + # via + # osc-lib + # python-cinderclient + # python-manilaclient + # python-neutronclient + # python-novaclient +six==1.16.0 + # via + # cryptography + # futurist + # gnocchiclient + # jsonpath-rw + # kubernetes + # macaroonbakery + # oslo-config + # paramiko + # pymacaroons + # pyopenssl + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-dateutil + # python-designateclient + # python-heatclient + # python-keystoneclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient + # python-swiftclient + # python-watcherclient +stevedore==5.1.0 + # via + # cliff + # dogpile-cache + # keystoneauth1 + # osc-lib + # oslo-config + # python-ceilometerclient + # python-designateclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient +tenacity==8.2.3 + # via + # zaza + # zaza-openstack +terminaltables==3.1.10 + # via python-libmaas +theblues==0.5.2 + # via juju +toposort==1.10 + # via juju +trustme==1.1.0 + # via zaza-openstack +typing-extensions==4.8.0 + # via + # dogpile-cache + # typing-inspect +typing-inspect==0.9.0 + # via juju +tzdata==2023.3 + # via + # oslo-serialization + # oslo-utils +ujson==5.8.0 + # via gnocchiclient +urllib3==1.26.18 + # via + # botocore + # kubernetes + # requests +warlock==2.0.1 + # via python-glanceclient +wcwidth==0.2.8 + # via cmd2 +webob==1.8.7 + # via osprofiler +websocket-client==1.6.4 + # via kubernetes +websockets==7.0 + # via juju +wrapt==1.15.0 + # via + # debtcollector + # python-glanceclient +yarl==1.9.2 + # via aiohttp +zaza @ git+https://github.com/openstack-charmers/zaza.git@stable/bobcat + # via + # -r src/test-requirements.in + # zaza-openstack +zaza-openstack @ git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/bobcat + # via -r src/test-requirements.in +zipp==3.17.0 + # via + # importlib-metadata + # importlib-resources diff --git a/src/test-requirements.txt b/src/test-requirements.in similarity index 79% rename from src/test-requirements.txt rename to src/test-requirements.in index e7710236..85845d60 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.in @@ -5,5 +5,5 @@ # # 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/bobcat#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/bobcat#egg=zaza.openstack diff --git a/src/tests/bundles/jammy-antelope-ha-ovn.yaml b/src/tests/bundles/jammy-antelope-ha-ovn.yaml index c4b50b2c..566bc5d2 100644 --- a/src/tests/bundles/jammy-antelope-ha-ovn.yaml +++ b/src/tests/bundles/jammy-antelope-ha-ovn.yaml @@ -105,39 +105,39 @@ applications: num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge keystone: charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge octavia-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge vault-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: constraints: mem=3072M charm: ch:mysql-innodb-cluster num_units: 3 - channel: latest/edge + channel: 8.0/edge neutron-api: constraints: cores=4 charm: ch:neutron-api @@ -148,7 +148,7 @@ applications: flat-network-providers: physnet1 enable-ml2-port-security: True neutron-security-groups: True - channel: latest/edge + channel: 2023.2/edge nova-cloud-controller: constraints: mem=7168M charm: ch:nova-cloud-controller @@ -157,7 +157,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2023.2/edge nova-compute: constraints: mem=7168M charm: ch:nova-compute @@ -165,15 +165,15 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2023.2/edge hacluster-octavia: series: *series charm: ch:hacluster - channel: latest/edge + channel: 2.4/edge ovn-chassis-octavia: series: *series charm: ch:ovn-chassis - channel: latest/edge + channel: 23.09/edge octavia: constraints: cores=8 series: *series @@ -186,7 +186,7 @@ applications: rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 - channel: latest/edge + channel: 3.9/edge glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 @@ -199,14 +199,14 @@ applications: 'release~(jammy)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" - channel: latest/edge + channel: 2023.2/edge octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: antelope - channel: latest/edge + channel: 2023.2/edge placement: charm: ch:placement num_units: 1 @@ -214,21 +214,21 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2023.2/edge neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: latest/edge + channel: 2023.2/edge ovn-central: constraints: mem=3072M charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: latest/edge + channel: 23.09/edge ovn-chassis: charm: ch:ovn-chassis - channel: latest/edge + channel: 23.09/edge vault: charm: ch:vault num_units: 1 - channel: latest/edge + channel: 1.8/edge diff --git a/src/tests/bundles/jammy-antelope-ha.yaml b/src/tests/bundles/jammy-antelope-ha.yaml index 169c43ad..4f4e71e4 100644 --- a/src/tests/bundles/jammy-antelope-ha.yaml +++ b/src/tests/bundles/jammy-antelope-ha.yaml @@ -97,39 +97,39 @@ applications: num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge keystone: charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge octavia-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge vault-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: constraints: mem=3072M charm: ch:mysql-innodb-cluster num_units: 3 - channel: latest/edge + channel: 8.0/edge neutron-api: charm: ch:neutron-api num_units: 1 @@ -141,7 +141,7 @@ applications: neutron-security-groups: True enable-dvr: True manage-neutron-plugin-legacy-mode: True - channel: latest/edge + channel: 2023.2/edge neutron-openvswitch: series: *series charm: ch:neutron-openvswitch @@ -153,7 +153,7 @@ applications: prevent-arp-spoofing: False firewall-driver: openvswitch bridge-mappings: physnet1:br-ex - channel: latest/edge + channel: 2023.2/edge neutron-openvswitch-octavia: series: *series charm: ch:neutron-openvswitch @@ -162,7 +162,7 @@ applications: debug: True prevent-arp-spoofing: False firewall-driver: openvswitch - channel: latest/edge + channel: 2023.2/edge nova-cloud-controller: constraints: mem=7168M charm: ch:nova-cloud-controller @@ -171,7 +171,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2023.2/edge nova-compute: constraints: mem=7168M charm: ch:nova-compute @@ -179,11 +179,11 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2023.2/edge hacluster-octavia: charm: ch:hacluster num_units: 0 - channel: latest/edge + channel: 2.4/edge octavia: constraints: cores=8 series: *series @@ -197,7 +197,7 @@ applications: rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 - channel: latest/edge + channel: 3.9/edge glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 @@ -210,14 +210,14 @@ applications: 'release~(jammy)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" - channel: latest/edge + channel: 2023.2/edge octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: antelope - channel: latest/edge + channel: 2023.2/edge placement: charm: ch:placement num_units: 1 @@ -225,8 +225,8 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2023.2/edge vault: charm: ch:vault num_units: 1 - channel: latest/edge + channel: 1.8/edge diff --git a/src/tests/bundles/jammy-bobcat-ha-ovn.yaml b/src/tests/bundles/jammy-bobcat-ha-ovn.yaml index 99ccc712..e1b9aace 100644 --- a/src/tests/bundles/jammy-bobcat-ha-ovn.yaml +++ b/src/tests/bundles/jammy-bobcat-ha-ovn.yaml @@ -105,39 +105,39 @@ applications: num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge keystone: charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge octavia-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge vault-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: constraints: mem=3072M charm: ch:mysql-innodb-cluster num_units: 3 - channel: latest/edge + channel: 8.0/edge neutron-api: constraints: cores=4 charm: ch:neutron-api @@ -148,7 +148,7 @@ applications: flat-network-providers: physnet1 enable-ml2-port-security: True neutron-security-groups: True - channel: latest/edge + channel: 2023.2/edge nova-cloud-controller: constraints: mem=7168M charm: ch:nova-cloud-controller @@ -157,7 +157,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2023.2/edge nova-compute: constraints: mem=7168M charm: ch:nova-compute @@ -165,15 +165,15 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2023.2/edge hacluster-octavia: series: *series charm: ch:hacluster - channel: latest/edge + channel: 2.4/edge ovn-chassis-octavia: series: *series charm: ch:ovn-chassis - channel: latest/edge + channel: 23.09/edge octavia: constraints: cores=8 series: *series @@ -186,7 +186,7 @@ applications: rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 - channel: latest/edge + channel: 3.9/edge glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 @@ -199,14 +199,14 @@ applications: 'release~(jammy)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" - channel: latest/edge + channel: 2023.2/edge octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: bobcat - channel: latest/edge + channel: 2023.2/edge placement: charm: ch:placement num_units: 1 @@ -214,21 +214,21 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2023.2/edge neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: latest/edge + channel: 2023.2/edge ovn-central: constraints: mem=3072M charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: latest/edge + channel: 23.09/edge ovn-chassis: charm: ch:ovn-chassis - channel: latest/edge + channel: 23.09/edge vault: charm: ch:vault num_units: 1 - channel: latest/edge + channel: 1.8/edge diff --git a/src/tests/bundles/jammy-bobcat-ha.yaml b/src/tests/bundles/jammy-bobcat-ha.yaml index f998c0a4..ecfa770f 100644 --- a/src/tests/bundles/jammy-bobcat-ha.yaml +++ b/src/tests/bundles/jammy-bobcat-ha.yaml @@ -97,39 +97,39 @@ applications: num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge keystone: charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge octavia-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge vault-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: constraints: mem=3072M charm: ch:mysql-innodb-cluster num_units: 3 - channel: latest/edge + channel: 8.0/edge neutron-api: charm: ch:neutron-api num_units: 1 @@ -141,7 +141,7 @@ applications: neutron-security-groups: True enable-dvr: True manage-neutron-plugin-legacy-mode: True - channel: latest/edge + channel: 2023.2/edge neutron-openvswitch: series: *series charm: ch:neutron-openvswitch @@ -153,7 +153,7 @@ applications: prevent-arp-spoofing: False firewall-driver: openvswitch bridge-mappings: physnet1:br-ex - channel: latest/edge + channel: 2023.2/edge neutron-openvswitch-octavia: series: *series charm: ch:neutron-openvswitch @@ -162,7 +162,7 @@ applications: debug: True prevent-arp-spoofing: False firewall-driver: openvswitch - channel: latest/edge + channel: 2023.2/edge nova-cloud-controller: constraints: mem=7168M charm: ch:nova-cloud-controller @@ -171,7 +171,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2023.2/edge nova-compute: constraints: mem=7168M charm: ch:nova-compute @@ -179,11 +179,11 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2023.2/edge hacluster-octavia: charm: ch:hacluster num_units: 0 - channel: latest/edge + channel: 2.4/edge octavia: constraints: cores=8 series: *series @@ -197,7 +197,7 @@ applications: rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 - channel: latest/edge + channel: 3.9/edge glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 @@ -210,14 +210,14 @@ applications: 'release~(jammy)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" - channel: latest/edge + channel: 2023.2/edge octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: bobcat - channel: latest/edge + channel: 2023.2/edge placement: charm: ch:placement num_units: 1 @@ -225,8 +225,8 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2023.2/edge vault: charm: ch:vault num_units: 1 - channel: latest/edge + channel: 1.8/edge diff --git a/src/tests/bundles/lunar-antelope-ha-ovn.yaml b/src/tests/bundles/lunar-antelope-ha-ovn.yaml deleted file mode 100644 index 45415817..00000000 --- a/src/tests/bundles/lunar-antelope-ha-ovn.yaml +++ /dev/null @@ -1,237 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -local_overlay_enabled: True - -series: &series lunar -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - glance-mysql-router:shared-db - - glance:shared-db -- - keystone-mysql-router:shared-db - - keystone:shared-db -- - neutron-mysql-router:shared-db - - neutron-api:shared-db -- - nova-mysql-router:shared-db - - nova-cloud-controller:shared-db -- - octavia-mysql-router:shared-db - - octavia:shared-db -- - keystone:identity-service - - glance:identity-service -- - keystone:identity-service - - nova-cloud-controller:identity-service -- - keystone:identity-service - - neutron-api:identity-service -- - keystone:identity-service - - octavia:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - rabbitmq-server:amqp - - neutron-api:amqp -- - rabbitmq-server:amqp - - glance:amqp -- - rabbitmq-server:amqp - - nova-cloud-controller:amqp -- - rabbitmq-server:amqp - - nova-compute:amqp -- - rabbitmq-server:amqp - - octavia:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:neutron-load-balancer - - octavia:neutron-api -- - glance-simplestreams-sync:juju-info - - octavia-diskimage-retrofit:juju-info -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - keystone:identity-credentials - - octavia-diskimage-retrofit:identity-credentials -- [ placement, placement-mysql-router ] -- [ placement, keystone ] -- [ placement, nova-cloud-controller ] -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - vault:shared-db - - vault-mysql-router:shared-db -- - ovn-central:certificates - - vault:certificates -- - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms -- - neutron-api:certificates - - vault:certificates -- - ovn-chassis:nova-compute - - nova-compute:neutron-plugin -- - ovn-chassis-octavia:ovsdb-subordinate - - octavia:ovsdb-subordinate -- - ovn-chassis-octavia:certificates - - vault:certificates -- - ovn-chassis-octavia:ovsdb - - ovn-central:ovsdb -- - ovn-central:ovsdb-cms - - octavia:ovsdb-cms -- - ovn-chassis:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - octavia:certificates -- - vault:certificates - - glance-simplestreams-sync:certificates -- - hacluster-octavia:ha - - octavia:ha -- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -applications: - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: latest/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: latest/edge - octavia-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - mysql-innodb-cluster: - constraints: mem=3072M - charm: ch:mysql-innodb-cluster - num_units: 3 - channel: latest/edge - neutron-api: - constraints: cores=4 - charm: ch:neutron-api - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - flat-network-providers: physnet1 - enable-ml2-port-security: True - neutron-security-groups: True - channel: latest/edge - nova-cloud-controller: - constraints: mem=7168M - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - network-manager: Neutron - channel: latest/edge - nova-compute: - constraints: mem=7168M - charm: ch:nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - debug: True - channel: latest/edge - hacluster-octavia: - series: *series - charm: ch:hacluster - channel: latest/edge - ovn-chassis-octavia: - series: *series - charm: ch:ovn-chassis - channel: latest/edge - options: - ovn-source: distro - octavia: - constraints: cores=8 - series: *series - charm: ../../../octavia_ubuntu-23.04-amd64.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - debug: True - loadbalancer-topology: 'ACTIVE_STANDBY' - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - channel: latest/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: False - mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', max: 1, - item_filters: [ - 'release~(jammy)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)']}]" - channel: latest/edge - octavia-diskimage-retrofit: - charm: ch:octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-series: *series - channel: latest/edge - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - debug: true - channel: latest/edge - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: latest/edge - ovn-central: - constraints: mem=3072M - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: latest/edge - ovn-chassis: - charm: ch:ovn-chassis - channel: latest/edge - options: - ovn-source: distro - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge diff --git a/src/tests/bundles/lunar-antelope-ha.yaml b/src/tests/bundles/lunar-antelope-ha.yaml deleted file mode 100644 index da687654..00000000 --- a/src/tests/bundles/lunar-antelope-ha.yaml +++ /dev/null @@ -1,231 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -local_overlay_enabled: True - -series: &series lunar -relations: -- - glance:image-service - - nova-cloud-controller:image-service -- - glance:image-service - - nova-compute:image-service -- - glance-mysql-router:shared-db - - glance:shared-db -- - keystone-mysql-router:shared-db - - keystone:shared-db -- - neutron-mysql-router:shared-db - - neutron-api:shared-db -- - nova-mysql-router:shared-db - - nova-cloud-controller:shared-db -- - octavia-mysql-router:shared-db - - octavia:shared-db -- - keystone:identity-service - - glance:identity-service -- - keystone:identity-service - - nova-cloud-controller:identity-service -- - keystone:identity-service - - neutron-api:identity-service -- - keystone:identity-service - - octavia:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - rabbitmq-server:amqp - - neutron-api:amqp -- - rabbitmq-server:amqp - - glance:amqp -- - rabbitmq-server:amqp - - nova-cloud-controller:amqp -- - rabbitmq-server:amqp - - nova-compute:amqp -- - rabbitmq-server:amqp - - octavia:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:neutron-load-balancer - - octavia:neutron-api -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -- - neutron-api:neutron-plugin-api - - neutron-openvswitch:neutron-plugin-api -- - neutron-openvswitch:neutron-plugin - - nova-compute:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch-octavia:amqp -- - neutron-api:neutron-plugin-api - - neutron-openvswitch-octavia:neutron-plugin-api -- - neutron-openvswitch-octavia:neutron-plugin - - octavia:neutron-openvswitch -- - hacluster-octavia:ha - - octavia:ha -- - glance-simplestreams-sync:juju-info - - octavia-diskimage-retrofit:juju-info -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - keystone:identity-credentials - - octavia-diskimage-retrofit:identity-credentials -- [ placement, placement-mysql-router ] -- [ placement, keystone ] -- [ placement, nova-cloud-controller ] -- - vault:shared-db - - vault-mysql-router:shared-db -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - neutron-api:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - octavia:certificates -- - vault:certificates - - octavia-diskimage-retrofit:certificates -- - vault:certificates - - glance-simplestreams-sync:certificates -- - vault:certificates - - placement:certificates -- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] -applications: - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: latest/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: latest/edge - octavia-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - mysql-innodb-cluster: - constraints: mem=3072M - charm: ch:mysql-innodb-cluster - num_units: 3 - channel: latest/edge - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - flat-network-providers: physnet1 - enable-ml2-port-security: True - neutron-security-groups: True - enable-dvr: True - manage-neutron-plugin-legacy-mode: True - channel: latest/edge - neutron-openvswitch: - series: *series - charm: ch:neutron-openvswitch - num_units: 0 - options: - debug: True - enable-local-dhcp-and-metadata: True - use-dvr-snat: True - prevent-arp-spoofing: False - firewall-driver: openvswitch - bridge-mappings: physnet1:br-ex - channel: latest/edge - neutron-openvswitch-octavia: - series: *series - charm: ch:neutron-openvswitch - num_units: 0 - options: - debug: True - prevent-arp-spoofing: False - firewall-driver: openvswitch - channel: latest/edge - nova-cloud-controller: - constraints: mem=7168M - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - network-manager: Neutron - channel: latest/edge - nova-compute: - constraints: mem=7168M - charm: ch:nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - debug: True - channel: latest/edge - hacluster-octavia: - charm: ch:hacluster - num_units: 0 - channel: latest/edge - octavia: - constraints: cores=8 - series: *series - charm: ../../../octavia_ubuntu-23.04-amd64.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - debug: True - loadbalancer-topology: 'ACTIVE_STANDBY' - vip: 'ADD YOUR VIP HERE' - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - channel: latest/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: False - mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/', - name_prefix: 'ubuntu:released', - path: 'streams/v1/index.sjson', max: 1, - item_filters: [ - 'release~(jammy)', - 'arch~(x86_64|amd64)', - 'ftype~(disk1.img|disk.img)']}]" - channel: latest/edge - octavia-diskimage-retrofit: - charm: ch:octavia-diskimage-retrofit - options: - amp-image-tag: 'octavia-amphora' - retrofit-series: *series - channel: latest/edge - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - debug: true - channel: latest/edge - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge diff --git a/src/tests/bundles/mantic-bobcat-ha-ovn.yaml b/src/tests/bundles/mantic-bobcat-ha-ovn.yaml index 14cc5d59..186c8d28 100644 --- a/src/tests/bundles/mantic-bobcat-ha-ovn.yaml +++ b/src/tests/bundles/mantic-bobcat-ha-ovn.yaml @@ -105,39 +105,39 @@ applications: num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge keystone: charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge octavia-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge vault-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: constraints: mem=3072M charm: ch:mysql-innodb-cluster num_units: 3 - channel: latest/edge + channel: 8.0/edge neutron-api: constraints: cores=4 charm: ch:neutron-api @@ -148,7 +148,7 @@ applications: flat-network-providers: physnet1 enable-ml2-port-security: True neutron-security-groups: True - channel: latest/edge + channel: 2023.2/edge nova-cloud-controller: constraints: mem=7168M charm: ch:nova-cloud-controller @@ -157,7 +157,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2023.2/edge nova-compute: constraints: mem=7168M charm: ch:nova-compute @@ -165,15 +165,15 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2023.2/edge hacluster-octavia: series: *series charm: ch:hacluster - channel: latest/edge + channel: 2.4/edge ovn-chassis-octavia: series: *series charm: ch:ovn-chassis - channel: latest/edge + channel: 23.09/edge options: ovn-source: distro octavia: @@ -188,7 +188,7 @@ applications: rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 - channel: latest/edge + channel: 3.9/edge glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 @@ -201,13 +201,13 @@ applications: 'release~(jammy)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" - channel: latest/edge + channel: 2023.2/edge octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series - channel: latest/edge + channel: 2023.2/edge placement: charm: ch:placement num_units: 1 @@ -215,23 +215,23 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2023.2/edge neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: latest/edge + channel: 2023.2/edge ovn-central: constraints: mem=3072M charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: latest/edge + channel: 23.09/edge ovn-chassis: charm: ch:ovn-chassis - channel: latest/edge + channel: 23.09/edge options: ovn-source: distro vault: charm: ch:vault num_units: 1 - channel: latest/edge + channel: 1.8/edge diff --git a/src/tests/bundles/mantic-bobcat-ha.yaml b/src/tests/bundles/mantic-bobcat-ha.yaml index 13d529e0..15b41319 100644 --- a/src/tests/bundles/mantic-bobcat-ha.yaml +++ b/src/tests/bundles/mantic-bobcat-ha.yaml @@ -97,39 +97,39 @@ applications: num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge keystone: charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2023.2/edge octavia-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge vault-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: constraints: mem=3072M charm: ch:mysql-innodb-cluster num_units: 3 - channel: latest/edge + channel: 8.0/edge neutron-api: charm: ch:neutron-api num_units: 1 @@ -141,7 +141,7 @@ applications: neutron-security-groups: True enable-dvr: True manage-neutron-plugin-legacy-mode: True - channel: latest/edge + channel: 2023.2/edge neutron-openvswitch: series: *series charm: ch:neutron-openvswitch @@ -153,7 +153,7 @@ applications: prevent-arp-spoofing: False firewall-driver: openvswitch bridge-mappings: physnet1:br-ex - channel: latest/edge + channel: 2023.2/edge neutron-openvswitch-octavia: series: *series charm: ch:neutron-openvswitch @@ -162,7 +162,7 @@ applications: debug: True prevent-arp-spoofing: False firewall-driver: openvswitch - channel: latest/edge + channel: 2023.2/edge nova-cloud-controller: constraints: mem=7168M charm: ch:nova-cloud-controller @@ -171,7 +171,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2023.2/edge nova-compute: constraints: mem=7168M charm: ch:nova-compute @@ -179,11 +179,11 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2023.2/edge hacluster-octavia: charm: ch:hacluster num_units: 0 - channel: latest/edge + channel: 2.4/edge octavia: constraints: cores=8 series: *series @@ -197,7 +197,7 @@ applications: rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 - channel: latest/edge + channel: 3.9/edge glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 @@ -210,13 +210,13 @@ applications: 'release~(jammy)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" - channel: latest/edge + channel: 2023.2/edge octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series - channel: latest/edge + channel: 2023.2/edge placement: charm: ch:placement num_units: 1 @@ -224,8 +224,8 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2023.2/edge vault: charm: ch:vault num_units: 1 - channel: latest/edge + channel: 1.8/edge diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4bbeb638..eb32dd8d 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -10,8 +10,6 @@ smoke_bundles: dev_bundles: - jammy-bobcat-ha-ovn - jammy-bobcat-ha -- lunar-antelope-ha-ovn -- lunar-antelope-ha - mantic-bobcat-ha-ovn - mantic-bobat-ha @@ -74,7 +72,5 @@ tests_options: policyd: service: octavia force_deploy: - - lunar-antelope-ha-ovn - mantic-bobcat-ha-ovn - - lunar-antelope-ha - mantic-bobcat-ha diff --git a/src/tox.ini b/src/tox.ini index 8ffff0f9..02883a74 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -25,29 +25,29 @@ passenv = CS_* OS_* TEST_* -deps = -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements-py38.txt [testenv:pep8] -basepython = python3 +basepython = python3.8 commands = charm-proof [testenv:func-noop] -basepython = python3 +basepython = python3.8 commands = functest-run-suite --help [testenv:func] -basepython = python3 +basepython = python3.8 commands = functest-run-suite --keep-model [testenv:func-smoke] -basepython = python3 +basepython = python3.8 commands = functest-run-suite --keep-model --smoke [testenv:func-target] -basepython = python3 +basepython = python3.8 commands = functest-run-suite --keep-model --bundle {posargs} diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 87371f89..fa5d8add 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -11,6 +11,6 @@ tenacity # https://github.com/eventlet/eventlet/issues/781 dnspython!=2.3.0 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/bobcat#egg=charms.openstack -git+https://github.com/juju/charm-helpers.git#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git@stable/bobcat#egg=charmhelpers diff --git a/test-requirements-py310.txt b/test-requirements-py310.txt new file mode 100644 index 00000000..c7e1a038 --- /dev/null +++ b/test-requirements-py310.txt @@ -0,0 +1,125 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --output-file=test-requirements-py310.txt test-requirements.in +# +certifi==2023.7.22 + # via requests +cffi==1.16.0 + # via cryptography +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/bobcat + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.1 + # via requests +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +coverage==7.3.2 + # via -r test-requirements.in +cryptography==3.3.2 + # via + # -r test-requirements.in + # pyopenssl +extras==1.0.0 + # via stestr +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.0.0 + # via -r test-requirements.in +idna==3.4 + # via requests +iso8601==2.1.0 + # via python-subunit +jinja2==3.1.2 + # via charmhelpers +lxml==4.9.3 + # via -r test-requirements.in +markupsafe==2.1.3 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +netaddr==0.9.0 + # via charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +prettytable==0.7.2 + # via cliff +psutil==5.9.6 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==23.9.7 + # via charms-reactive +pycparser==2.21 + # via cffi +pyopenssl==21.0.0 + # via -r test-requirements.in +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +python-subunit==1.4.3 + # via stestr +pyyaml==6.0.1 + # via + # charmhelpers + # cliff + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # hvac +six==1.16.0 + # via + # cliff + # cmd2 + # cryptography + # fixtures + # pyopenssl +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.1.0 + # via cliff +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.6.0 + # via + # fixtures + # python-subunit + # stestr +tomlkit==0.12.1 + # via stestr +urllib3==2.0.7 + # via requests +voluptuous==0.13.1 + # via stestr +wcwidth==0.2.8 + # via cmd2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/test-requirements-py38.txt b/test-requirements-py38.txt new file mode 100644 index 00000000..876e953c --- /dev/null +++ b/test-requirements-py38.txt @@ -0,0 +1,125 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --output-file=test-requirements-py38.txt test-requirements.in +# +certifi==2023.7.22 + # via requests +cffi==1.16.0 + # via cryptography +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/bobcat + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.1 + # via requests +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +coverage==7.3.2 + # via -r test-requirements.in +cryptography==3.3.2 + # via + # -r test-requirements.in + # pyopenssl +extras==1.0.0 + # via stestr +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.0.0 + # via -r test-requirements.in +idna==3.4 + # via requests +iso8601==2.1.0 + # via python-subunit +jinja2==3.1.2 + # via charmhelpers +lxml==4.9.3 + # via -r test-requirements.in +markupsafe==2.1.3 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +netaddr==0.9.0 + # via charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +prettytable==0.7.2 + # via cliff +psutil==5.9.6 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==23.9.7 + # via charms-reactive +pycparser==2.21 + # via cffi +pyopenssl==21.0.0 + # via -r test-requirements.in +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +python-subunit==1.4.3 + # via stestr +pyyaml==6.0.1 + # via + # charmhelpers + # cliff + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # hvac +six==1.16.0 + # via + # cliff + # cmd2 + # cryptography + # fixtures + # pyopenssl +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.1.0 + # via cliff +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.6.0 + # via + # fixtures + # python-subunit + # stestr +tomlkit==0.12.1 + # via stestr +urllib3==2.0.7 + # via requests +voluptuous==0.13.1 + # via stestr +wcwidth==0.2.8 + # via cmd2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/test-requirements.txt b/test-requirements.in similarity index 93% rename from test-requirements.txt rename to test-requirements.in index 3f84ab4b..459a32b7 100644 --- a/test-requirements.txt +++ b/test-requirements.in @@ -19,7 +19,7 @@ mock>=1.2 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/bobcat#egg=charms.openstack # # Revisit for removal / mock improvement: # diff --git a/tox.ini b/tox.ini index ffcca2b7..f6226ac7 100644 --- a/tox.ini +++ b/tox.ini @@ -33,53 +33,46 @@ allowlist_externals = charmcraft bash tox - rename.sh deps = - -r{toxinidir}/requirements.txt + -r{toxinidir}/merged-requirements-py38.txt [testenv:build] basepython = python3 +deps = # charmcraft clean is done to ensure that # `tox -e build` always performs a clean, repeatable build. # For faster rebuilds during development, -# directly run `charmcraft -v pack && ./rename.sh`. +# directly run `charmcraft -v pack commands = charmcraft clean charmcraft -v pack charmcraft clean -[testenv:build-reactive] -basepython = python3 -commands = - charm-build --log-level DEBUG --use-lock-file-branches --binary-wheels-from-source -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 -deps = -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements-py310.txt +commands = stestr run --slowest {posargs} + +[testenv:py38] +basepython = python3.8 +deps = -r{toxinidir}/test-requirements-py38.txt commands = stestr run --slowest {posargs} [testenv:py310] basepython = python3.10 -deps = -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements-py310.txt commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3 deps = flake8==3.9.2 - git+https://github.com/juju/charm-tools.git commands = flake8 {posargs} src unit_tests [testenv:cover] # Technique based heavily upon # https://github.com/openstack/nova/blob/master/tox.ini basepython = python3 -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/merged-requirements-py310.txt setenv = {[testenv]setenv} PYTHON=coverage run