openstack/charm-manila-ganesha
Code Issues Proposed changes

Add Kinetic and Zed support

Browse Source 
* sync charm-helpers to classic charms
* change openstack-origin/source default to zed
* align testing with zed
* add new zed bundles
* add zed bundles to tests.yaml
* add zed tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases
* add bindep.txt for py310
* sync tox.ini and requirements.txt for ruamel
* use charmcraft_channel 2.0/stable
* drop reactive plugin overrides
* move interface/layer env vars to charmcraft.yaml

Change-Id: I0ab3ae0d7a7055fdc70e831b12c4cf37b2711978
This commit is contained in:
Corey Bryant 2022-06-10 20:14:47 +00:00 committed by Alex Kavanagh
parent 65ca408318
commit 60aea29fb0
14 changed files with 73 additions and 461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -1,5 +1,5 @@
- project: - project:
templates: templates:
- openstack-python3-charm-yoga-jobs - openstack-python3-charm-zed-jobs
- openstack-cover-jobs - openstack-cover-jobs

4
bindep.txt Normal file
View File

@ -0,0 +1,4 @@
libffi-dev [platform:dpkg]
libpq-dev [platform:dpkg]
libxml2-dev [platform:dpkg]
libxslt1-dev [platform:dpkg]

30
charmcraft.yaml
View File

@ -2,32 +2,24 @@ type: charm
parts: parts:
charm: charm:
build-packages: source: src/
- tox plugin: reactive
- git build-snaps:
- python3-dev - charm
override-build: | build-environment:
apt-get install ca-certificates -y - CHARM_INTERFACES_DIR: /root/project/interfaces/
tox -e build-reactive - CHARM_LAYERS_DIR: /root/project/layers/
override-stage: |
echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
override-prime: |
# For some reason, the normal priming chokes on the fact that there's a
# hooks directory.
cp -r $CHARMCRAFT_STAGE/* .
bases: bases:
- build-on: - build-on:
- name: ubuntu - name: ubuntu
channel: "20.04" channel: "22.04"
architectures: architectures:
- amd64 - amd64
run-on: run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu - name: ubuntu
channel: "22.04" channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64] architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.10"
architectures: [amd64, s390x, ppc64el, arm64]

6
osci.yaml
View File

@ -1,11 +1,9 @@
- project: - project:
templates: templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py310 - charm-unit-jobs-py310
- charm-yoga-functional-jobs - charm-zed-functional-jobs
- charm-xena-functional-jobs
- charm-yoga-functional-jobs
vars: vars:
needs_charm_build: true needs_charm_build: true
charm_build_name: manila-ganesha charm_build_name: manila-ganesha
build_type: charmcraft build_type: charmcraft
charmcraft_channel: 2.0/stable

12
requirements.txt
View File

@ -15,16 +15,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
# #
cryptography<3.4 cryptography<3.4
# Build requirements git+https://github.com/juju/charm-tools.git
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
git+https://github.com/juju/charm-tools#egg=charm-tools
simplejson simplejson
# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
# "ModuleNotFoundError")
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
# some tox targets use only test-requirements.txt whereas charm-build uses only
# requirements.txt
importlib-metadata<3.0.0; python_version < '3.6'
importlib-resources<3.0.0; python_version < '3.6'

2
src/config.yaml
View File

@ -1,6 +1,6 @@
options: options:
openstack-origin: openstack-origin:
default: yoga default: zed
type: string type: string
description: | description: |
Repository from which to install. May be one of the following: Repository from which to install. May be one of the following:

2
src/metadata.yaml
View File

@ -10,8 +10,8 @@ tags:
- storage - storage
- file-servers - file-servers
series: series:
- focal
- jammy - jammy
- kinetic
subordinate: false subordinate: false
extra-bindings: extra-bindings:
tenant-storage: tenant-storage:

340
src/tests/bundles/focal-yoga.yaml
View File

@ -1,340 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
local_overlay_enabled: True
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
'7':
'8':
'9':
'10':
'11':
'12':
'13':
'14':
'15':
'16':
'17':
constraints: mem=8G
'18':
constraints: mem=8G
'19':
'20':
'21':
'22':
'23':
services:
manila-mysql-router:
charm: ch:mysql-router
channel: latest/edge
manila-ganesha-mysql-router:
charm: ch:mysql-router
channel: latest/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
channel: latest/edge
manila-ganesha-az1:
num_units: 3
charm: ../../../manila-ganesha.charm
options:
openstack-origin: *openstack-origin
to:
- '3'
- '4'
- '5'
ceph-mon:
charm: ch:ceph-mon
num_units: 3
options:
source: *openstack-origin
to:
- '6'
- '7'
- '8'
channel: quincy/edge
ceph-osd:
charm: ch:ceph-osd
num_units: 3
options:
source: *openstack-origin
storage:
osd-devices: 'cinder,10G'
to:
- '9'
- '10'
- '11'
channel: quincy/edge
ceph-fs:
charm: ch:ceph-fs
num_units: 2
options:
source: *openstack-origin
to:
- '12'
- '13'
channel: quincy/edge
manila:
charm: ch:manila
num_units: 1
options:
default-share-backend: cephfsnfs1
share-protocols: NFS
openstack-origin: *openstack-origin
to:
- '14'
channel: yoga/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '15'
channel: yoga/edge
placement:
charm: ch:placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '16'
channel: yoga/edge
nova-compute:
charm: ch:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
openstack-origin: *openstack-origin
to:
- '17'
- '18'
channel: yoga/edge
glance:
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '19'
channel: yoga/edge
neutron-api:
charm: ch:neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
neutron-plugin: ovs
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
to:
- '20'
channel: yoga/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: yoga/edge
neutron-gateway:
charm: ch:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '21'
channel: yoga/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '22'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '23'
channel: yoga/edge
nrpe:
charm: ch:nrpe
relations:
- - 'ceph-mon'
- 'ceph-osd'
- - 'ceph-mon'
- 'ceph-fs'
- - 'ceph-mon'
- 'manila-ganesha-az1'
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila-ganesha-az1'
- 'rabbitmq-server'
- - 'manila-ganesha-az1'
- 'keystone'
- - 'manila'
- 'manila-ganesha-az1'
- - 'manila-ganesha-az1:shared-db'
- 'manila-ganesha-mysql-router:shared-db'
- - 'manila-ganesha-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-api:shared-db'
- 'neutron-api-mysql-router:shared-db'
- - 'neutron-api-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:neutron-api'
- 'nova-cloud-controller:neutron-api'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'placement:amqp'
- 'rabbitmq-server:amqp'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'neutron-api:neutron-plugin-api'
- 'neutron-gateway:neutron-plugin-api'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'nova-compute:neutron-plugin'
- 'neutron-openvswitch:neutron-plugin'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-gateway:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-openvswitch:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:quantum-network-service'
- 'neutron-gateway:quantum-network-service'
- - 'manila-ganesha-az1:nrpe-external-master'
- 'nrpe:nrpe-external-master'

24
src/tests/bundles/jammy-yoga.yaml
View File

@ -92,7 +92,7 @@ services:
- '6' - '6'
- '7' - '7'
- '8' - '8'
channel: quincy/edge channel: latest/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@ -105,7 +105,7 @@ services:
- '9' - '9'
- '10' - '10'
- '11' - '11'
channel: quincy/edge channel: latest/edge
ceph-fs: ceph-fs:
charm: ch:ceph-fs charm: ch:ceph-fs
@ -115,7 +115,7 @@ services:
to: to:
- '12' - '12'
- '13' - '13'
channel: quincy/edge channel: latest/edge
manila: manila:
charm: ch:manila charm: ch:manila
@ -126,7 +126,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '14' - '14'
channel: yoga/edge channel: latest/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -136,7 +136,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: yoga/edge channel: latest/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -145,7 +145,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '16' - '16'
channel: yoga/edge channel: latest/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -159,7 +159,7 @@ services:
to: to:
- '17' - '17'
- '18' - '18'
channel: yoga/edge channel: latest/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -168,7 +168,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '19' - '19'
channel: yoga/edge channel: latest/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -181,11 +181,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '20' - '20'
channel: yoga/edge channel: latest/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: yoga/edge channel: latest/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -195,7 +195,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '21' - '21'
channel: yoga/edge channel: latest/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -213,7 +213,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '23' - '23'
channel: yoga/edge channel: latest/edge
relations: relations:

29
src/tests/bundles/focal-xena.yaml → src/tests/bundles/jammy-zed.yaml
View File

@ -1,9 +1,9 @@
variables: variables:
openstack-origin: &openstack-origin cloud:focal-xena openstack-origin: &openstack-origin cloud:jammy-zed
local_overlay_enabled: True local_overlay_enabled: True
series: focal series: jammy
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -92,7 +92,7 @@ services:
- '6' - '6'
- '7' - '7'
- '8' - '8'
channel: quincy/edge channel: latest/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@ -105,7 +105,7 @@ services:
- '9' - '9'
- '10' - '10'
- '11' - '11'
channel: quincy/edge channel: latest/edge
ceph-fs: ceph-fs:
charm: ch:ceph-fs charm: ch:ceph-fs
@ -115,7 +115,7 @@ services:
to: to:
- '12' - '12'
- '13' - '13'
channel: quincy/edge channel: latest/edge
manila: manila:
charm: ch:manila charm: ch:manila
@ -126,7 +126,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '14' - '14'
channel: yoga/edge channel: latest/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -136,7 +136,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: yoga/edge channel: latest/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -145,7 +145,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '16' - '16'
channel: yoga/edge channel: latest/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -159,7 +159,7 @@ services:
to: to:
- '17' - '17'
- '18' - '18'
channel: yoga/edge channel: latest/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -168,7 +168,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '19' - '19'
channel: yoga/edge channel: latest/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -181,11 +181,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '20' - '20'
channel: yoga/edge channel: latest/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: yoga/edge channel: latest/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -195,7 +195,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '21' - '21'
channel: yoga/edge channel: latest/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -213,10 +213,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '23' - '23'
channel: yoga/edge channel: latest/edge
nrpe: nrpe:
charm: ch:nrpe charm: ch:nrpe
channel: latest/edge
relations: relations:

27
src/tests/bundles/impish-xena.yaml → src/tests/bundles/kinetic-zed.yaml
View File

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: True local_overlay_enabled: True
series: impish series: kinetic
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
@ -92,7 +92,7 @@ services:
- '6' - '6'
- '7' - '7'
- '8' - '8'
channel: quincy/edge channel: latest/edge
ceph-osd: ceph-osd:
charm: ch:ceph-osd charm: ch:ceph-osd
@ -105,7 +105,7 @@ services:
- '9' - '9'
- '10' - '10'
- '11' - '11'
channel: quincy/edge channel: latest/edge
ceph-fs: ceph-fs:
charm: ch:ceph-fs charm: ch:ceph-fs
@ -115,7 +115,7 @@ services:
to: to:
- '12' - '12'
- '13' - '13'
channel: quincy/edge channel: latest/edge
manila: manila:
charm: ch:manila charm: ch:manila
@ -126,7 +126,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '14' - '14'
channel: yoga/edge channel: latest/edge
nova-cloud-controller: nova-cloud-controller:
charm: ch:nova-cloud-controller charm: ch:nova-cloud-controller
@ -136,7 +136,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '15' - '15'
channel: yoga/edge channel: latest/edge
placement: placement:
charm: ch:placement charm: ch:placement
@ -145,7 +145,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '16' - '16'
channel: yoga/edge channel: latest/edge
nova-compute: nova-compute:
charm: ch:nova-compute charm: ch:nova-compute
@ -159,7 +159,7 @@ services:
to: to:
- '17' - '17'
- '18' - '18'
channel: yoga/edge channel: latest/edge
glance: glance:
charm: ch:glance charm: ch:glance
@ -168,7 +168,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '19' - '19'
channel: yoga/edge channel: latest/edge
neutron-api: neutron-api:
charm: ch:neutron-api charm: ch:neutron-api
@ -181,11 +181,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '20' - '20'
channel: yoga/edge channel: latest/edge
neutron-openvswitch: neutron-openvswitch:
charm: ch:neutron-openvswitch charm: ch:neutron-openvswitch
channel: yoga/edge channel: latest/edge
neutron-gateway: neutron-gateway:
charm: ch:neutron-gateway charm: ch:neutron-gateway
@ -195,7 +195,7 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '21' - '21'
channel: yoga/edge channel: latest/edge
rabbitmq-server: rabbitmq-server:
charm: ch:rabbitmq-server charm: ch:rabbitmq-server
@ -213,10 +213,11 @@ services:
openstack-origin: *openstack-origin openstack-origin: *openstack-origin
to: to:
- '23' - '23'
channel: yoga/edge channel: latest/edge
nrpe: nrpe:
charm: ch:nrpe charm: ch:nrpe
channel: latest/edge
relations: relations:

15
src/tests/tests.yaml
View File

@ -1,15 +1,15 @@
charm_name: manila-ganesha charm_name: manila-ganesha
gate_bundles: gate_bundles:
- focal-xena
- impish-xena
dev_bundles:
- focal-yoga
- jammy-yoga - jammy-yoga
dev_bundles:
- jammy-yoga
- jammy-zed
- kinetic-zed
smoke_bundles: smoke_bundles:
- focal-xena - jammy-yoga
target_deploy_status: {} target_deploy_status: {}
@ -26,5 +26,4 @@ configure:
tests_options: tests_options:
force_deploy: force_deploy:
- impish-xena - kinetic-zed
- jammy-yoga

18
test-requirements.txt
View File

@ -4,7 +4,6 @@
# https://github.com/openstack-charmers/release-tools # https://github.com/openstack-charmers/release-tools
# #
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
stestr>=2.2.0 stestr>=2.2.0
@ -13,25 +12,10 @@ stestr>=2.2.0
# https://github.com/mtreinish/stestr/issues/145 # https://github.com/mtreinish/stestr/issues/145
cliff<3.0.0 cliff<3.0.0
# Dependencies of stestr. Newer versions use keywords that didn't exist in
# python 3.5 yet (e.g. "ModuleNotFoundError")
importlib-metadata<3.0.0; python_version < '3.6'
importlib-resources<3.0.0; python_version < '3.6'
# Some Zuul nodes sometimes pull newer versions of these dependencies which
# dropped support for python 3.5:
osprofiler<2.7.0;python_version<'3.6'
stevedore<1.31.0;python_version<'3.6'
debtcollector<1.22.0;python_version<'3.6'
oslo.utils<=3.41.0;python_version<'3.6'
requests>=2.18.4 requests>=2.18.4
charms.reactive charms.reactive
# Newer mock seems to have some syntax which is newer than python3.5 (e.g. mock>=1.2
# f'{something}'
mock>=1.2,<4.0.0; python_version < '3.6'
mock>=1.2; python_version >= '3.6'
nose>=1.3.7 nose>=1.3.7
coverage>=3.6 coverage>=3.6

23
tox.ini
View File

@ -31,10 +31,8 @@ minversion = 3.18.0
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0 PYTHONHASHSEED=0
TERM=linux TERM=linux
LAYER_PATH={toxinidir}/layers
INTERFACE_PATH={toxinidir}/interfaces
JUJU_REPOSITORY={toxinidir}/build JUJU_REPOSITORY={toxinidir}/build
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY passenv = no_proxy http_proxy https_proxy JUJU_REPOSITORY
install_command = install_command =
{toxinidir}/pip.sh install {opts} {packages} {toxinidir}/pip.sh install {opts} {packages}
allowlist_externals = allowlist_externals =
@ -50,7 +48,7 @@ basepython = python3
deps = -r{toxinidir}/build-requirements.txt deps = -r{toxinidir}/build-requirements.txt
commands = commands =
charmcraft clean charmcraft clean
charmcraft -v build charmcraft -v pack
{toxinidir}/rename.sh {toxinidir}/rename.sh
[testenv:build-reactive] [testenv:build-reactive]
@ -68,21 +66,6 @@ basepython = python3
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
[testenv:py36]
basepython = python3.6
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py38]
basepython = python3.8
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py310] [testenv:py310]
basepython = python3.10 basepython = python3.10
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
@ -91,7 +74,7 @@ commands = stestr run --slowest {posargs}
[testenv:pep8] [testenv:pep8]
basepython = python3 basepython = python3
deps = flake8==3.9.2 deps = flake8==3.9.2
charm-tools==2.8.3 git+https://github.com/juju/charm-tools.git
commands = flake8 {posargs} src unit_tests commands = flake8 {posargs} src unit_tests
[testenv:func-target] [testenv:func-target]