From bb16e670dc6490f0095ecc20b3535d105b1f32fb Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Mon, 31 Oct 2022 14:20:36 +0100 Subject: [PATCH] Partial revert[1] to re-enable Focal support 1: 51f59879d381e44958970ada79a784d8cce9a92e Change-Id: I565e36b94d249d2cf0beccf1480189a19da008d9 --- config.yaml | 2 +- metadata.yaml | 1 + osci.yaml | 31 ++++++ tests/bundles/focal-yoga-multisite.yaml | 99 ++++++++++++++++++ tests/bundles/focal-yoga-namespaced.yaml | 124 +++++++++++++++++++++++ tests/bundles/focal-yoga.yaml | 123 ++++++++++++++++++++++ tests/tests.yaml | 3 + tox.ini | 9 ++ 8 files changed, 391 insertions(+), 1 deletion(-) create mode 100644 tests/bundles/focal-yoga-multisite.yaml create mode 100644 tests/bundles/focal-yoga-namespaced.yaml create mode 100644 tests/bundles/focal-yoga.yaml diff --git a/config.yaml b/config.yaml index 2cfd3e08..3c621136 100644 --- a/config.yaml +++ b/config.yaml @@ -5,7 +5,7 @@ options: description: RadosGW debug level. Max is 20. source: type: string - default: zed + default: yoga description: | Optional repository from which to install. May be one of the following: distro (default), ppa:somecustom/ppa, a deb url sources entry, diff --git a/metadata.yaml b/metadata.yaml index a0f590d3..195d9e38 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -13,6 +13,7 @@ tags: - file-servers - misc series: +- focal - jammy extra-bindings: public: diff --git a/osci.yaml b/osci.yaml index ebd411b1..cb19e21d 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,8 +1,13 @@ - project: templates: + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-unit-jobs-py310 check: jobs: + - vault-focal-yoga_rgw + - vault-focal-yoga-namespaced + - focal-yoga-multisite - jammy-yoga-multisite - jammy-zed-multisite: voting: false @@ -23,6 +28,18 @@ charm_build_name: ceph-radosgw build_type: charmcraft charmcraft_channel: 2.0/stable +- job: + name: focal-yoga-multisite + parent: func-target + dependencies: + - osci-lint + - charm-build + - tox-py38 + - tox-py39 + - name: tox-py310 + soft: true + vars: + tox_extra_args: focal-yoga-multisite - job: name: jammy-yoga-multisite parent: func-target @@ -47,6 +64,13 @@ - jammy-yoga-multisite vars: tox_extra_args: kinetic-zed-multisite +- job: + name: vault-focal-yoga_rgw + parent: func-target + dependencies: + - focal-yoga-multisite + vars: + tox_extra_args: vault:focal-yoga - job: name: vault-jammy-yoga_rgw parent: func-target @@ -54,6 +78,13 @@ - jammy-yoga-multisite vars: tox_extra_args: vault:jammy-yoga +- job: + name: vault-focal-yoga-namespaced + parent: func-target + dependencies: + - focal-yoga-multisite + vars: + tox_extra_args: vault:focal-yoga-namespaced - job: name: vault-jammy-yoga-namespaced parent: func-target diff --git a/tests/bundles/focal-yoga-multisite.yaml b/tests/bundles/focal-yoga-multisite.yaml new file mode 100644 index 00000000..8c1a1cfd --- /dev/null +++ b/tests/bundles/focal-yoga-multisite.yaml @@ -0,0 +1,99 @@ +options: + source: &source cloud:focal-yoga + +series: focal + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + '1': + '2': + '3': + '4': + '5': + '6': + '7': + '8': + '9': + +applications: + ceph-radosgw: + charm: ../../ceph-radosgw.charm + num_units: 1 + options: + source: *source + to: + - '0' + + secondary-ceph-radosgw: + charm: ../../ceph-radosgw.charm + num_units: 1 + options: + source: *source + to: + - '1' + + ceph-osd: + charm: ch:ceph-osd + num_units: 3 + constraints: "mem=2048" + storage: + osd-devices: 'cinder,10G' + options: + source: *source + osd-devices: '/srv/ceph /dev/test-non-existent' + to: + - '2' + - '6' + - '7' + channel: latest/edge + + secondary-ceph-osd: + charm: ch:ceph-osd + num_units: 3 + constraints: "mem=2048" + storage: + osd-devices: 'cinder,10G' + options: + source: *source + osd-devices: '/srv/ceph /dev/test-non-existent' + to: + - '3' + - '8' + - '9' + channel: latest/edge + + ceph-mon: + charm: ch:ceph-mon + num_units: 1 + options: + monitor-count: 1 + source: *source + to: + - '4' + channel: latest/edge + + secondary-ceph-mon: + charm: ch:ceph-mon + num_units: 1 + options: + monitor-count: 1 + source: *source + to: + - '5' + channel: latest/edge + +relations: + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'ceph-radosgw:mon' + - 'ceph-mon:radosgw' + + - - 'secondary-ceph-osd:mon' + - 'secondary-ceph-mon:osd' + + - - 'secondary-ceph-radosgw:mon' + - 'secondary-ceph-mon:radosgw' + diff --git a/tests/bundles/focal-yoga-namespaced.yaml b/tests/bundles/focal-yoga-namespaced.yaml new file mode 100644 index 00000000..7d05aa82 --- /dev/null +++ b/tests/bundles/focal-yoga-namespaced.yaml @@ -0,0 +1,124 @@ +options: + source: &source cloud:focal-yoga + +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': + +applications: + + keystone-mysql-router: + charm: ch:mysql-router + channel: latest/edge + + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + num_units: 3 + options: + source: *source + to: + - '0' + - '1' + - '2' + channel: latest/edge + + ceph-radosgw: + charm: ../../ceph-radosgw.charm + num_units: 1 + options: + source: *source + namespace-tenants: True + to: + - '3' + + ceph-osd: + charm: ch:ceph-osd + num_units: 3 + constraints: "mem=2048" + storage: + osd-devices: 'cinder,10G' + options: + source: *source + osd-devices: '/srv/ceph /dev/test-non-existent' + to: + - '4' + - '5' + - '6' + channel: latest/edge + + ceph-mon: + charm: ch:ceph-mon + num_units: 3 + options: + source: *source + to: + - '7' + - '8' + - '9' + channel: latest/edge + + keystone: + expose: True + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *source + to: + - '10' + channel: latest/edge + + vault-mysql-router: + charm: ch:mysql-router + channel: latest/edge + + vault: + charm: ch:vault + num_units: 1 + to: + - '11' + channel: latest/edge + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'ceph-radosgw:mon' + - 'ceph-mon:radosgw' + + - - 'ceph-radosgw:identity-service' + - 'keystone:identity-service' + + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + + - - 'keystone:certificates' + - 'vault:certificates' + + - - 'ceph-radosgw:certificates' + - 'vault:certificates' diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml new file mode 100644 index 00000000..697a9be8 --- /dev/null +++ b/tests/bundles/focal-yoga.yaml @@ -0,0 +1,123 @@ +options: + source: &source cloud:focal-yoga + +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': + +applications: + + keystone-mysql-router: + charm: ch:mysql-router + channel: latest/edge + + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + num_units: 3 + options: + source: *source + to: + - '0' + - '1' + - '2' + channel: latest/edge + + ceph-radosgw: + charm: ../../ceph-radosgw.charm + num_units: 1 + options: + source: *source + to: + - '3' + + ceph-osd: + charm: ch:ceph-osd + num_units: 3 + constraints: "mem=2048" + storage: + osd-devices: 'cinder,10G' + options: + source: *source + osd-devices: '/srv/ceph /dev/test-non-existent' + to: + - '4' + - '5' + - '6' + channel: latest/edge + + ceph-mon: + charm: ch:ceph-mon + num_units: 3 + options: + source: *source + to: + - '7' + - '8' + - '9' + channel: latest/edge + + keystone: + expose: True + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *source + to: + - '10' + channel: latest/edge + + vault-mysql-router: + charm: ch:mysql-router + channel: latest/edge + + vault: + charm: ch:vault + num_units: 1 + to: + - '11' + channel: latest/edge + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'ceph-radosgw:mon' + - 'ceph-mon:radosgw' + + - - 'ceph-radosgw:identity-service' + - 'keystone:identity-service' + + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + + - - 'keystone:certificates' + - 'vault:certificates' + + - - 'ceph-radosgw:certificates' + - 'vault:certificates' diff --git a/tests/tests.yaml b/tests/tests.yaml index 4ccd8cb0..d45160cd 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -4,6 +4,9 @@ gate_bundles: - jammy-yoga-multisite - vault: jammy-yoga - vault: jammy-yoga-namespaced + - focal-yoga-multisite + - vault: focal-yoga + - vault: focal-yoga-namespaced smoke_bundles: - jammy-yoga-multisite diff --git a/tox.ini b/tox.ini index bddbd1f2..45b39294 100644 --- a/tox.ini +++ b/tox.ini @@ -51,6 +51,15 @@ commands = charmcraft -v pack {toxinidir}/rename.sh +[testenv:py38] +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:py310] basepython = python3.10 deps = -r{toxinidir}/requirements.txt