diff --git a/osci.yaml b/osci.yaml index 591bacc..54ddc19 100644 --- a/osci.yaml +++ b/osci.yaml @@ -5,14 +5,10 @@ jobs: - ceph-iscsi-focal-quincy - ceph-iscsi-focal-quincy-ec - - ceph-iscsi-jammy-quincy - - ceph-iscsi-jammy-quincy-ec - ceph-iscsi-jammy-reef - ceph-iscsi-jammy-reef-ec - - ceph-iscsi-lunar-quincy: - voting: false - - ceph-iscsi-lunar-quincy-ec: - voting: false + - ceph-iscsi-jammy-caracal + - ceph-iscsi-jammy-caracal-ec vars: needs_charm_build: true charm_build_name: ceph-iscsi @@ -21,36 +17,13 @@ - job: name: ceph-iscsi-focal-quincy parent: func-target - dependencies: - - ceph-iscsi-jammy-quincy vars: tox_extra_args: -- focal - job: name: ceph-iscsi-focal-quincy-ec parent: func-target - dependencies: - - ceph-iscsi-jammy-quincy vars: tox_extra_args: -- focal-ec - -- job: - name: ceph-iscsi-jammy-quincy - parent: func-target - dependencies: - - charm-build - - osci-lint - - name: tox-py310 - soft: true - vars: - tox_extra_args: -- jammy -- job: - name: ceph-iscsi-jammy-quincy-ec - parent: func-target - dependencies: - - ceph-iscsi-jammy-quincy - vars: - tox_extra_args: -- jammy-ec - - job: name: ceph-iscsi-jammy-reef parent: func-target @@ -68,20 +41,15 @@ - ceph-iscsi-jammy-reef vars: tox_extra_args: -- jammy-reef-ec - - job: - name: ceph-iscsi-lunar-quincy + name: ceph-iscsi-jammy-caracal parent: func-target - voting: false - dependencies: - - ceph-iscsi-jammy-quincy vars: - tox_extra_args: -- lunar + tox_extra_args: -- jammy-caracal - job: - name: ceph-iscsi-lunar-quincy-ec + name: ceph-iscsi-jammy-caracal-ec parent: func-target - voting: false dependencies: - - ceph-iscsi-jammy-quincy + - ceph-iscsi-jammy-caracal vars: - tox_extra_args: -- lunar-ec + tox_extra_args: -- jammy-caracal-ec diff --git a/tests/bundles/jammy-caracal-ec.yaml b/tests/bundles/jammy-caracal-ec.yaml new file mode 100644 index 0000000..f887904 --- /dev/null +++ b/tests/bundles/jammy-caracal-ec.yaml @@ -0,0 +1,101 @@ +variables: + source: &source cloud:jammy-caracal + +local_overlay_enabled: False +series: jammy +machines: + '0': + '1': + '2': + '3': + '4': + '5': + '6': + '7': + '8': + constraints: mem=3072M + '9': + constraints: mem=3072M + '10': + constraints: mem=3072M + '11': + '12': + '13': + '14': + '15': +applications: + ubuntu: + charm: cs:ubuntu + num_units: 3 + to: + - '7' + - '14' + - '15' + ceph-iscsi: + charm: ../../ceph-iscsi.charm + num_units: 2 + options: + gateway-metadata-pool: iscsi-foo-metadata + pool-type: erasure-coded + ec-profile-k: 4 + ec-profile-m: 2 + source: *source + to: + - '0' + - '1' + ceph-osd: + charm: ch:ceph-osd + num_units: 6 + storage: + osd-devices: 'cinder,10G' + options: + osd-devices: '/dev/test-non-existent' + source: *source + to: + - '0' + - '1' + - '2' + - '11' + - '12' + - '13' + channel: latest/edge + ceph-mon: + charm: ch:ceph-mon + num_units: 3 + options: + monitor-count: '3' + source: *source + to: + - '3' + - '4' + - '5' + channel: latest/edge + vault: + num_units: 1 + charm: ch:vault + to: + - '6' + channel: 1.8/stable + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + num_units: 3 + to: + - '8' + - '9' + - '10' + channel: 8.0/edge + vault-mysql-router: + charm: ch:mysql-router + channel: 8.0/edge + +relations: + - - 'ceph-mon:client' + - 'ceph-iscsi:ceph-client' + - - 'vault:certificates' + - 'ceph-iscsi:certificates' + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' diff --git a/tests/bundles/jammy-caracal.yaml b/tests/bundles/jammy-caracal.yaml new file mode 100644 index 0000000..a4dd586 --- /dev/null +++ b/tests/bundles/jammy-caracal.yaml @@ -0,0 +1,102 @@ +options: + source: &source cloud:jammy-caracal + +local_overlay_enabled: False +series: jammy +machines: + '0': + '1': + '2': + '3': + '4': + '5': + '6': + '7': + '8': + constraints: mem=3072M + '9': + constraints: mem=3072M + '10': + constraints: mem=3072M + '11': + '12': + '13': + '14': + '15': + '16': + '17': +applications: + ubuntu: + charm: cs:ubuntu + num_units: 3 + to: + - '7' + - '14' + - '15' + ceph-iscsi: + charm: ../../ceph-iscsi.charm + num_units: 4 + options: + gateway-metadata-pool: iscsi-foo-metadata + source: *source + to: + - '0' + - '1' + - '16' + - '17' + ceph-osd: + charm: ch:ceph-osd + num_units: 6 + storage: + osd-devices: 'cinder,10G' + options: + osd-devices: '/dev/test-non-existent' + source: *source + to: + - '0' + - '1' + - '2' + - '11' + - '12' + - '13' + channel: latest/edge + ceph-mon: + charm: ch:ceph-mon + num_units: 3 + options: + monitor-count: '3' + source: *source + to: + - '3' + - '4' + - '5' + channel: latest/edge + vault: + num_units: 1 + charm: ch:vault + to: + - '6' + channel: 1.8/stable + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + num_units: 3 + to: + - '8' + - '9' + - '10' + channel: 8.0/edge + vault-mysql-router: + charm: ch:mysql-router + channel: 8.0/edge + +relations: + - - 'ceph-mon:client' + - 'ceph-iscsi:ceph-client' + - - 'vault:certificates' + - 'ceph-iscsi:certificates' + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router'