From 123697e62f4a381b4e7c830fb119a17ac13dcdcc Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 12 Nov 2021 11:00:21 -0500 Subject: [PATCH] Additional test updates * drop xenial metadata and function tests * switch to release-specific zosci functional tests * switch to yoga zosci unit test job * add py39 Change-Id: I248d0c92e64692127e2a53a8cffc2efe56a8d790 --- metadata.yaml | 1 - osci.yaml | 30 +++------- tests/bundles/xenial-mitaka.yaml | 97 -------------------------------- tests/bundles/xenial-queens.yaml | 97 -------------------------------- tests/tests.yaml | 2 - tox.ini | 5 ++ 6 files changed, 13 insertions(+), 219 deletions(-) delete mode 100644 tests/bundles/xenial-mitaka.yaml delete mode 100644 tests/bundles/xenial-queens.yaml diff --git a/metadata.yaml b/metadata.yaml index 97e4c08..399403a 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -8,7 +8,6 @@ tags: - misc - openstack series: -- xenial - bionic - focal - groovy diff --git a/osci.yaml b/osci.yaml index 8185bc0..0b2a0aa 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,24 +1,10 @@ - project: templates: - - charm-unit-jobs - check: - jobs: - - xenial-mitaka - - bionic-queens - - bionic-stein - - bionic-train - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - - focal-xena - - focal-yoga: - voting: false - # hirsuite-wallaby disabled due to: - # https://bugs.launchpad.net/charm-ceph-osd/+bug/1929732 - - hirsute-wallaby: - voting: false - - impish-xena: - voting: false - - jammy-yoga: - voting: false + - charm-yoga-unit-jobs + - charm-yoga-functional-jobs + - charm-xena-functional-jobs + - charm-wallaby-functional-jobs + - charm-victoria-functional-jobs + - charm-ussuri-functional-jobs + - charm-stein-functional-jobs + - charm-queens-functional-jobs diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml deleted file mode 100644 index 0882c4a..0000000 --- a/tests/bundles/xenial-mitaka.yaml +++ /dev/null @@ -1,97 +0,0 @@ -options: - source: &source distro - -series: xenial - -comment: - - 'machines section to decide order of deployment. database sooner = faster' - -machines: - '0': - '1': - '2': - '3': - '4': - '5': - '6': - constraints: "mem=2048" - '7': - constraints: "mem=2048" - '8': - constraints: "mem=2048" - '9': - '10': - '11': - -relations: - - ['vault:shared-db', 'mysql:shared-db'] - - ['keystone:shared-db', 'mysql:shared-db'] - - ['glance:shared-db', 'mysql:shared-db'] - - ['glance:ceph', 'ceph-mon:client'] - - ['keystone:certificates', 'vault:certificates'] - - ['glance:certificates', 'vault:certificates'] - - ['glance-simplestreams-sync:certificates', 'vault:certificates'] - - ['glance:identity-service', 'keystone:identity-service'] - - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service'] - - ['ceph-osd:mon', 'ceph-mon:osd'] - - ['ceph-radosgw:mon', 'ceph-mon:radosgw'] - - ['ceph-radosgw:identity-service', 'keystone:identity-service'] - - ['ceph-radosgw:certificates', 'vault:certificates'] - -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '2' - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '3' - glance-simplestreams-sync: - charm: ../../glance-simplestreams-sync - num_units: 1 - to: - - '4' - ceph-radosgw: - charm: cs:~openstack-charmers-next/ceph-radosgw - num_units: 1 - options: - source: *source - to: - - '5' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '6' - - '7' - - '8' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *source - to: - - '9' - - '10' - - '11' diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml deleted file mode 100644 index 511f156..0000000 --- a/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -1,97 +0,0 @@ -options: - source: &source cloud:xenial-queens - -series: xenial - -comment: - - 'machines section to decide order of deployment. database sooner = faster' - -machines: - '0': - '1': - '2': - '3': - '4': - '5': - '6': - constraints: "mem=2048" - '7': - constraints: "mem=2048" - '8': - constraints: "mem=2048" - '9': - '10': - '11': - -relations: - - ['vault:shared-db', 'mysql:shared-db'] - - ['keystone:shared-db', 'mysql:shared-db'] - - ['glance:shared-db', 'mysql:shared-db'] - - ['glance:ceph', 'ceph-mon:client'] - - ['keystone:certificates', 'vault:certificates'] - - ['glance:certificates', 'vault:certificates'] - - ['glance-simplestreams-sync:certificates', 'vault:certificates'] - - ['glance:identity-service', 'keystone:identity-service'] - - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service'] - - ['ceph-osd:mon', 'ceph-mon:osd'] - - ['ceph-radosgw:mon', 'ceph-mon:radosgw'] - - ['ceph-radosgw:identity-service', 'keystone:identity-service'] - - ['ceph-radosgw:certificates', 'vault:certificates'] - -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '2' - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '3' - glance-simplestreams-sync: - charm: ../../glance-simplestreams-sync - num_units: 1 - to: - - '4' - ceph-radosgw: - charm: cs:~openstack-charmers-next/ceph-radosgw - num_units: 1 - options: - source: *source - to: - - '5' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '6' - - '7' - - '8' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *source - to: - - '9' - - '10' - - '11' diff --git a/tests/tests.yaml b/tests/tests.yaml index af92d5f..ec69c88 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -17,8 +17,6 @@ gate_bundles: - impish-xena dev_bundles: - - xenial-mitaka - - xenial-queens - bionic-rocky - bionic-train - focal-yoga diff --git a/tox.ini b/tox.ini index ba4fd5b..86d1e90 100644 --- a/tox.ini +++ b/tox.ini @@ -61,6 +61,11 @@ basepython = python3.8 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +[testenv:py39] +basepython = python3.9 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + [testenv:py3] basepython = python3 deps = -r{toxinidir}/requirements.txt