From eb3cdf7b06292ace746be86d7716fb1b5c8fd8d6 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Thu, 21 Sep 2023 20:22:21 +0000 Subject: [PATCH] Merge magnum bundles into main bundles When regression testing stable point releases, we typically test several projects with one of the main bundles. The stable releases now include magnum, so this should hopefully make testing SRUs in a single deployment possible, even though they will take longer to run. This also bumps the ceph-osd storage to 24G since magnum setup uploads image(s) and we were running out of storage. --- .../tests/bundles/bionic-queens.yaml | 2 +- .../tests/bundles/bionic-rocky.yaml | 2 +- .../tests/bundles/bionic-stein.yaml | 2 +- .../tests/bundles/bionic-train.yaml | 2 +- .../tests/bundles/bionic-ussuri.yaml | 2 +- .../tests/bundles/focal-ussuri-base.yaml | 315 ----------------- .../tests/bundles/focal-ussuri-magnum.yaml | 1 - .../tests/bundles/focal-ussuri-ovn-22.03.yaml | 2 +- .../tests/bundles/focal-ussuri.yaml | 125 ++++--- .../tests/bundles/focal-victoria-base.yaml | 315 ----------------- .../tests/bundles/focal-victoria-magnum.yaml | 1 - .../tests/bundles/focal-victoria.yaml | 125 ++++--- .../tests/bundles/focal-wallaby-base.yaml | 315 ----------------- .../tests/bundles/focal-wallaby-magnum.yaml | 1 - .../tests/bundles/focal-wallaby.yaml | 135 +++++--- .../tests/bundles/focal-xena-base.yaml | 315 ----------------- .../tests/bundles/focal-xena-magnum.yaml | 1 - .../tests/bundles/focal-xena.yaml | 135 +++++--- .../tests/bundles/focal-yoga-base.yaml | 315 ----------------- .../tests/bundles/focal-yoga-magnum.yaml | 1 - .../tests/bundles/focal-yoga.yaml | 135 +++++--- .../tests/bundles/jammy-antelope-base.yaml | 315 ----------------- .../tests/bundles/jammy-antelope-magnum.yaml | 1 - .../tests/bundles/jammy-antelope.yaml | 42 ++- .../tests/bundles/jammy-bobcat.yaml | 43 ++- .../tests/bundles/jammy-yoga-base.yaml | 315 ----------------- .../tests/bundles/jammy-yoga-magnum.yaml | 1 - .../tests/bundles/jammy-yoga.yaml | 135 +++++--- .../tests/bundles/jammy-zed-base.yaml | 315 ----------------- .../tests/bundles/jammy-zed-magnum.yaml | 1 - .../tests/bundles/jammy-zed.yaml | 26 +- .../tests/bundles/lunar-antelope-base.yaml | 316 ------------------ .../tests/bundles/lunar-antelope-magnum.yaml | 1 - .../tests/bundles/lunar-antelope.yaml | 42 ++- .../tests/bundles/mantic-bobcat.yaml | 42 ++- .../overlays/focal-ussuri-magnum.yaml.j2 | 84 ----- .../overlays/focal-victoria-magnum.yaml.j2 | 84 ----- .../overlays/focal-wallaby-magnum.yaml.j2 | 84 ----- .../overlays/focal-xena-magnum.yaml.j2 | 84 ----- .../overlays/focal-yoga-magnum.yaml.j2 | 84 ----- .../overlays/jammy-antelope-magnum.yaml.j2 | 84 ----- .../overlays/jammy-yoga-magnum.yaml.j2 | 84 ----- .../bundles/overlays/jammy-zed-magnum.yaml.j2 | 84 ----- .../overlays/lunar-antelope-magnum.yaml.j2 | 84 ----- tests/distro-regression/tests/tests.yaml | 66 ++-- 45 files changed, 677 insertions(+), 3987 deletions(-) delete mode 100644 tests/distro-regression/tests/bundles/focal-ussuri-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/focal-ussuri-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/focal-victoria-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/focal-victoria-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/focal-wallaby-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/focal-wallaby-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/focal-xena-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/focal-xena-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/focal-yoga-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/focal-yoga-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/jammy-antelope-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/jammy-antelope-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/jammy-yoga-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/jammy-yoga-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/jammy-zed-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/jammy-zed-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/lunar-antelope-base.yaml delete mode 120000 tests/distro-regression/tests/bundles/lunar-antelope-magnum.yaml delete mode 100644 tests/distro-regression/tests/bundles/overlays/focal-ussuri-magnum.yaml.j2 delete mode 100644 tests/distro-regression/tests/bundles/overlays/focal-victoria-magnum.yaml.j2 delete mode 100644 tests/distro-regression/tests/bundles/overlays/focal-wallaby-magnum.yaml.j2 delete mode 100644 tests/distro-regression/tests/bundles/overlays/focal-xena-magnum.yaml.j2 delete mode 100644 tests/distro-regression/tests/bundles/overlays/focal-yoga-magnum.yaml.j2 delete mode 100644 tests/distro-regression/tests/bundles/overlays/jammy-antelope-magnum.yaml.j2 delete mode 100644 tests/distro-regression/tests/bundles/overlays/jammy-yoga-magnum.yaml.j2 delete mode 100644 tests/distro-regression/tests/bundles/overlays/jammy-zed-magnum.yaml.j2 delete mode 100644 tests/distro-regression/tests/bundles/overlays/lunar-antelope-magnum.yaml.j2 diff --git a/tests/distro-regression/tests/bundles/bionic-queens.yaml b/tests/distro-regression/tests/bundles/bionic-queens.yaml index 5d1a03fb..2fb6cb0d 100644 --- a/tests/distro-regression/tests/bundles/bionic-queens.yaml +++ b/tests/distro-regression/tests/bundles/bionic-queens.yaml @@ -35,7 +35,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: luminous/edge cinder: diff --git a/tests/distro-regression/tests/bundles/bionic-rocky.yaml b/tests/distro-regression/tests/bundles/bionic-rocky.yaml index ae30ce14..d2ca1a81 100644 --- a/tests/distro-regression/tests/bundles/bionic-rocky.yaml +++ b/tests/distro-regression/tests/bundles/bionic-rocky.yaml @@ -43,7 +43,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: mimic/edge cinder: diff --git a/tests/distro-regression/tests/bundles/bionic-stein.yaml b/tests/distro-regression/tests/bundles/bionic-stein.yaml index dd71ed2b..d69f2c3c 100644 --- a/tests/distro-regression/tests/bundles/bionic-stein.yaml +++ b/tests/distro-regression/tests/bundles/bionic-stein.yaml @@ -43,7 +43,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: octopus/edge cinder: diff --git a/tests/distro-regression/tests/bundles/bionic-train.yaml b/tests/distro-regression/tests/bundles/bionic-train.yaml index 8fef9c9f..cb99b515 100644 --- a/tests/distro-regression/tests/bundles/bionic-train.yaml +++ b/tests/distro-regression/tests/bundles/bionic-train.yaml @@ -43,7 +43,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: nautilus/edge cinder: diff --git a/tests/distro-regression/tests/bundles/bionic-ussuri.yaml b/tests/distro-regression/tests/bundles/bionic-ussuri.yaml index 342e1a70..2446e955 100644 --- a/tests/distro-regression/tests/bundles/bionic-ussuri.yaml +++ b/tests/distro-regression/tests/bundles/bionic-ussuri.yaml @@ -43,7 +43,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: octopus/edge cinder: diff --git a/tests/distro-regression/tests/bundles/focal-ussuri-base.yaml b/tests/distro-regression/tests/bundles/focal-ussuri-base.yaml deleted file mode 100644 index e5387fce..00000000 --- a/tests/distro-regression/tests/bundles/focal-ussuri-base.yaml +++ /dev/null @@ -1,315 +0,0 @@ -variables: - source: &source proposed - openstack-origin: &openstack-origin distro-proposed - openstack-channel: &openstack-channel ussuri/edge - ceph-channel: &ceph-channel octopus/edge - ovn-channel: &ovn-channel 20.03/edge - -series: &series focal -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: 8.0/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: 3.8/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/focal-ussuri-magnum.yaml b/tests/distro-regression/tests/bundles/focal-ussuri-magnum.yaml deleted file mode 120000 index 7f728062..00000000 --- a/tests/distro-regression/tests/bundles/focal-ussuri-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -focal-ussuri-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/focal-ussuri-ovn-22.03.yaml b/tests/distro-regression/tests/bundles/focal-ussuri-ovn-22.03.yaml index a9dc5a58..fe9030e6 100644 --- a/tests/distro-regression/tests/bundles/focal-ussuri-ovn-22.03.yaml +++ b/tests/distro-regression/tests/bundles/focal-ussuri-ovn-22.03.yaml @@ -49,7 +49,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: octopus/edge cinder: diff --git a/tests/distro-regression/tests/bundles/focal-ussuri.yaml b/tests/distro-regression/tests/bundles/focal-ussuri.yaml index c2e4653f..eb20b7e5 100644 --- a/tests/distro-regression/tests/bundles/focal-ussuri.yaml +++ b/tests/distro-regression/tests/bundles/focal-ussuri.yaml @@ -1,6 +1,13 @@ variables: source: &source proposed openstack-origin: &openstack-origin distro-proposed + openstack-channel: &openstack-channel ussuri/edge + ceph-channel: &ceph-channel octopus/edge + ovn-channel: &ovn-channel 20.03/edge + mysql-channel: &mysql-channel 8.0/edge + rabbitmq-channel: &rabbitmq-channel 3.8/edge + memcached-channel: &memcached-channel latest/edge + vault-channel: &vault-channel 1.7/edge series: &series focal applications: @@ -10,30 +17,30 @@ applications: options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel aodh-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel barbican: charm: ch:barbican num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel barbican-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ceilometer: charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel ceilometer-agent: charm: ch:ceilometer-agent - channel: ussuri/edge + channel: *openstack-channel ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -41,16 +48,16 @@ applications: expected-osd-count: 3 source: *source constraints: mem=1024 - channel: octopus/edge + channel: *ceph-channel ceph-osd: charm: ch:ceph-osd num_units: 3 options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 - channel: octopus/edge + channel: *ceph-channel cinder: charm: ch:cinder num_units: 1 @@ -59,13 +66,13 @@ applications: glance-api-version: 2 openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel cinder-ceph: charm: ch:cinder-ceph - channel: ussuri/edge + channel: *openstack-channel cinder-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel designate: charm: ch:designate num_units: 1 @@ -77,42 +84,42 @@ applications: nova-domain-email: bob@serverstack.ubuntu.com openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel designate-bind: charm: ch:designate-bind num_units: 1 - channel: ussuri/edge + channel: *openstack-channel designate-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel glance-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel gnocchi: charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin - channel: ussuri/edge + channel: *openstack-channel gnocchi-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel heat: charm: ch:heat num_units: 1 options: openstack-origin: *openstack-origin - channel: ussuri/edge + channel: *openstack-channel heat-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel keystone: charm: ch:keystone num_units: 1 @@ -120,39 +127,51 @@ applications: admin-password: openstack openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel keystone-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel memcached: charm: ch:memcached num_units: 1 constraints: mem=1024 - channel: latest/edge + channel: *memcached-channel mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 constraints: mem=4096 - channel: 8.0/edge + channel: *mysql-channel vault: charm: ch:vault num_units: 1 - channel: 1.7/edge + channel: *vault-channel vault-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ovn-central: charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: 20.03/edge + channel: *ovn-channel neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: ussuri/edge + channel: *openstack-channel ovn-chassis: charm: ch:ovn-chassis - channel: 20.03/edge + channel: *ovn-channel neutron-api: charm: ch:neutron-api num_units: 1 @@ -164,10 +183,10 @@ applications: enable-qos: true enable-vlan-trunking: true constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel neutron-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -175,7 +194,7 @@ applications: network-manager: Neutron openstack-origin: *openstack-origin constraints: mem=4096 - channel: ussuri/edge + channel: *openstack-channel nova-compute: charm: ch:nova-compute num_units: 3 @@ -185,34 +204,34 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin constraints: mem=4096 - channel: ussuri/edge + channel: *openstack-channel nova-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel openstack-dashboard: charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel placement: charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel placement-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 options: source: *source constraints: mem=1024 - channel: 3.8/edge + channel: *rabbitmq-channel swift-proxy: charm: ch:swift-proxy num_units: 1 @@ -222,7 +241,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae zone-assignment: manual constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel swift-storage-z1: charm: ch:swift-storage num_units: 1 @@ -232,7 +251,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel swift-storage-z2: charm: ch:swift-storage num_units: 1 @@ -242,7 +261,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel swift-storage-z3: charm: ch:swift-storage num_units: 1 @@ -252,7 +271,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: ussuri/edge + channel: *openstack-channel octavia: charm: ch:octavia num_units: 1 @@ -260,23 +279,23 @@ applications: openstack-origin: *openstack-origin spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' - channel: ussuri/edge + channel: *openstack-channel octavia-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: true constraints: root-disk=8G - channel: ussuri/edge + channel: *openstack-channel octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series - channel: ussuri/edge + channel: *openstack-channel relations: - - nova-cloud-controller:amqp - rabbitmq-server:amqp @@ -494,3 +513,15 @@ relations: - octavia-diskimage-retrofit:certificates - - vault:certificates - glance-simplestreams-sync:certificates +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/focal-victoria-base.yaml b/tests/distro-regression/tests/bundles/focal-victoria-base.yaml deleted file mode 100644 index c45aacc5..00000000 --- a/tests/distro-regression/tests/bundles/focal-victoria-base.yaml +++ /dev/null @@ -1,315 +0,0 @@ -variables: - source: &source cloud:focal-victoria/proposed - openstack-origin: &openstack-origin cloud:focal-victoria/proposed - openstack-channel: &openstack-channel victoria/edge - ceph-channel: &ceph-channel octopus/edge - ovn-channel: &ovn-channel 20.03/edge - -series: &series focal -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: 8.0/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: 3.8/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/focal-victoria-magnum.yaml b/tests/distro-regression/tests/bundles/focal-victoria-magnum.yaml deleted file mode 120000 index fc723f14..00000000 --- a/tests/distro-regression/tests/bundles/focal-victoria-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -focal-victoria-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/focal-victoria.yaml b/tests/distro-regression/tests/bundles/focal-victoria.yaml index 253b150a..03200df1 100644 --- a/tests/distro-regression/tests/bundles/focal-victoria.yaml +++ b/tests/distro-regression/tests/bundles/focal-victoria.yaml @@ -2,6 +2,13 @@ variables: source: &source cloud:focal-victoria/proposed openstack-origin: &openstack-origin cloud:focal-victoria/proposed retrofit-uca-pocket: &retrofit-uca-pocket victoria + openstack-channel: &openstack-channel victoria/edge + ceph-channel: &ceph-channel octopus/edge + ovn-channel: &ovn-channel 20.03/edge + mysql-channel: &mysql-channel 8.0/edge + rabbitmq-channel: &rabbitmq-channel 3.8/edge + memcached-channel: &memcached-channel latest/edge + vault-channel: &vault-channel 1.7/edge series: &series focal applications: @@ -11,30 +18,30 @@ applications: options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel aodh-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel barbican: charm: ch:barbican num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel barbican-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ceilometer: charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel ceilometer-agent: charm: ch:ceilometer-agent - channel: victoria/edge + channel: *openstack-channel ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -42,16 +49,16 @@ applications: expected-osd-count: 3 source: *source constraints: mem=1024 - channel: octopus/edge + channel: *ceph-channel ceph-osd: charm: ch:ceph-osd num_units: 3 options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 - channel: octopus/edge + channel: *ceph-channel cinder: charm: ch:cinder num_units: 1 @@ -60,13 +67,13 @@ applications: glance-api-version: 2 openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel cinder-ceph: charm: ch:cinder-ceph - channel: victoria/edge + channel: *openstack-channel cinder-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel designate: charm: ch:designate num_units: 1 @@ -78,42 +85,42 @@ applications: nova-domain-email: bob@serverstack.ubuntu.com openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel designate-bind: charm: ch:designate-bind num_units: 1 - channel: victoria/edge + channel: *openstack-channel designate-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel glance-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel gnocchi: charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin - channel: victoria/edge + channel: *openstack-channel gnocchi-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel heat: charm: ch:heat num_units: 1 options: openstack-origin: *openstack-origin - channel: victoria/edge + channel: *openstack-channel heat-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel keystone: charm: ch:keystone num_units: 1 @@ -121,39 +128,51 @@ applications: admin-password: openstack openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel keystone-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel memcached: charm: ch:memcached num_units: 1 constraints: mem=1024 - channel: latest/edge + channel: *memcached-channel mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 constraints: mem=4096 - channel: 8.0/edge + channel: *mysql-channel vault: charm: ch:vault num_units: 1 - channel: 1.7/edge + channel: *vault-channel vault-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ovn-central: charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: 20.03/edge + channel: *ovn-channel neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: victoria/edge + channel: *openstack-channel ovn-chassis: charm: ch:ovn-chassis - channel: 20.03/edge + channel: *ovn-channel neutron-api: charm: ch:neutron-api num_units: 1 @@ -165,10 +184,10 @@ applications: enable-qos: true enable-vlan-trunking: true constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel neutron-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -176,7 +195,7 @@ applications: network-manager: Neutron openstack-origin: *openstack-origin constraints: mem=4096 - channel: victoria/edge + channel: *openstack-channel nova-compute: charm: ch:nova-compute num_units: 3 @@ -186,34 +205,34 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin constraints: mem=4096 - channel: victoria/edge + channel: *openstack-channel nova-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel openstack-dashboard: charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel placement: charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel placement-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 options: source: *source constraints: mem=1024 - channel: 3.8/edge + channel: *rabbitmq-channel swift-proxy: charm: ch:swift-proxy num_units: 1 @@ -223,7 +242,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae zone-assignment: manual constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel swift-storage-z1: charm: ch:swift-storage num_units: 1 @@ -233,7 +252,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel swift-storage-z2: charm: ch:swift-storage num_units: 1 @@ -243,7 +262,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel swift-storage-z3: charm: ch:swift-storage num_units: 1 @@ -253,7 +272,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: victoria/edge + channel: *openstack-channel octavia: charm: ch:octavia num_units: 1 @@ -261,24 +280,24 @@ applications: openstack-origin: *openstack-origin spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' - channel: victoria/edge + channel: *openstack-channel octavia-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: true constraints: root-disk=8G - channel: victoria/edge + channel: *openstack-channel octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: *retrofit-uca-pocket - channel: victoria/edge + channel: *openstack-channel relations: - - nova-cloud-controller:amqp - rabbitmq-server:amqp @@ -496,3 +515,15 @@ relations: - octavia-diskimage-retrofit:certificates - - vault:certificates - glance-simplestreams-sync:certificates +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/focal-wallaby-base.yaml b/tests/distro-regression/tests/bundles/focal-wallaby-base.yaml deleted file mode 100644 index 23954550..00000000 --- a/tests/distro-regression/tests/bundles/focal-wallaby-base.yaml +++ /dev/null @@ -1,315 +0,0 @@ -variables: - source: &source cloud:focal-wallaby/proposed - openstack-origin: &openstack-origin cloud:focal-wallaby/proposed - openstack-channel: &openstack-channel wallaby/edge - ceph-channel: &ceph-channel pacific/edge - ovn-channel: &ovn-channel 20.12/edge - -series: &series focal -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: 8.0/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: 3.8/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/focal-wallaby-magnum.yaml b/tests/distro-regression/tests/bundles/focal-wallaby-magnum.yaml deleted file mode 120000 index d89a32d9..00000000 --- a/tests/distro-regression/tests/bundles/focal-wallaby-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -focal-wallaby-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/focal-wallaby.yaml b/tests/distro-regression/tests/bundles/focal-wallaby.yaml index 87062866..05364b6b 100644 --- a/tests/distro-regression/tests/bundles/focal-wallaby.yaml +++ b/tests/distro-regression/tests/bundles/focal-wallaby.yaml @@ -2,6 +2,13 @@ variables: source: &source cloud:focal-wallaby/proposed openstack-origin: &openstack-origin cloud:focal-wallaby/proposed retrofit-uca-pocket: &retrofit-uca-pocket wallaby + openstack-channel: &openstack-channel wallaby/edge + ceph-channel: &ceph-channel pacific/edge + ovn-channel: &ovn-channel 20.12/edge + mysql-channel: &mysql-channel 8.0/edge + rabbitmq-channel: &rabbitmq-channel 3.8/edge + memcached-channel: &memcached-channel latest/edge + vault-channel: &vault-channel 1.7/edge series: &series focal applications: @@ -11,36 +18,36 @@ applications: options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel aodh-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel barbican: charm: ch:barbican num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel barbican-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ceilometer: charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel ceilometer-agent: charm: ch:ceilometer-agent - channel: wallaby/edge + channel: *openstack-channel ceph-fs: num_units: 1 charm: ch:ceph-fs options: source: *source - channel: pacific/edge + channel: *ceph-channel ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -48,16 +55,16 @@ applications: expected-osd-count: 3 source: *source constraints: mem=1024 - channel: pacific/edge + channel: *ceph-channel ceph-osd: charm: ch:ceph-osd num_units: 3 options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 - channel: pacific/edge + channel: *ceph-channel cinder: charm: ch:cinder num_units: 1 @@ -66,13 +73,13 @@ applications: glance-api-version: 2 openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel cinder-ceph: charm: ch:cinder-ceph - channel: wallaby/edge + channel: *openstack-channel cinder-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel designate: charm: ch:designate num_units: 1 @@ -84,42 +91,42 @@ applications: nova-domain-email: bob@serverstack.ubuntu.com openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel designate-bind: charm: ch:designate-bind num_units: 1 - channel: wallaby/edge + channel: *openstack-channel designate-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel glance-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel gnocchi: charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin - channel: wallaby/edge + channel: *openstack-channel gnocchi-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel heat: charm: ch:heat num_units: 1 options: openstack-origin: *openstack-origin - channel: wallaby/edge + channel: *openstack-channel heat-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel keystone: charm: ch:keystone num_units: 1 @@ -127,10 +134,22 @@ applications: admin-password: openstack openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel keystone-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -138,48 +157,48 @@ applications: default-share-backend: cephfsnfs1 share-protocols: NFS openstack-origin: *openstack-origin - channel: wallaby/edge + channel: *openstack-channel manila-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel manila-ganesha: charm: ch:manila-ganesha num_units: 1 options: openstack-origin: *openstack-origin - channel: wallaby/edge + channel: *openstack-channel manila-ganesha-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel memcached: charm: ch:memcached num_units: 1 constraints: mem=1024 - channel: latest/edge + channel: *memcached-channel mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 constraints: mem=4096 - channel: 8.0/edge + channel: *mysql-channel vault: charm: ch:vault num_units: 1 - channel: 1.7/edge + channel: *vault-channel vault-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ovn-central: charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: 20.12/edge + channel: *ovn-channel neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: wallaby/edge + channel: *openstack-channel ovn-chassis: charm: ch:ovn-chassis - channel: 20.12/edge + channel: *ovn-channel neutron-api: charm: ch:neutron-api num_units: 1 @@ -191,10 +210,10 @@ applications: enable-qos: true enable-vlan-trunking: true constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel neutron-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -202,7 +221,7 @@ applications: network-manager: Neutron openstack-origin: *openstack-origin constraints: mem=4096 - channel: wallaby/edge + channel: *openstack-channel nova-compute: charm: ch:nova-compute num_units: 3 @@ -212,34 +231,34 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin constraints: mem=4096 - channel: wallaby/edge + channel: *openstack-channel nova-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel openstack-dashboard: charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel placement: charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel placement-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 options: source: *source constraints: mem=1024 - channel: 3.8/edge + channel: *rabbitmq-channel swift-proxy: charm: ch:swift-proxy num_units: 1 @@ -249,7 +268,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae zone-assignment: manual constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel swift-storage-z1: charm: ch:swift-storage num_units: 1 @@ -259,7 +278,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel swift-storage-z2: charm: ch:swift-storage num_units: 1 @@ -269,7 +288,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel swift-storage-z3: charm: ch:swift-storage num_units: 1 @@ -279,7 +298,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: wallaby/edge + channel: *openstack-channel octavia: charm: ch:octavia num_units: 1 @@ -287,24 +306,24 @@ applications: openstack-origin: *openstack-origin spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' - channel: wallaby/edge + channel: *openstack-channel octavia-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: true constraints: root-disk=8G - channel: wallaby/edge + channel: *openstack-channel octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: *retrofit-uca-pocket - channel: wallaby/edge + channel: *openstack-channel relations: - - nova-cloud-controller:amqp - rabbitmq-server:amqp @@ -546,3 +565,15 @@ relations: - rabbitmq-server - - manila - keystone +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/focal-xena-base.yaml b/tests/distro-regression/tests/bundles/focal-xena-base.yaml deleted file mode 100644 index aecdaf8f..00000000 --- a/tests/distro-regression/tests/bundles/focal-xena-base.yaml +++ /dev/null @@ -1,315 +0,0 @@ -variables: - source: &source cloud:focal-xena/proposed - openstack-origin: &openstack-origin cloud:focal-xena/proposed - openstack-channel: &openstack-channel xena/edge - ceph-channel: &ceph-channel pacific/edge - ovn-channel: &ovn-channel 21.09/edge - -series: &series focal -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: 8.0/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: 3.8/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/focal-xena-magnum.yaml b/tests/distro-regression/tests/bundles/focal-xena-magnum.yaml deleted file mode 120000 index 50e91f56..00000000 --- a/tests/distro-regression/tests/bundles/focal-xena-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -focal-xena-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/focal-xena.yaml b/tests/distro-regression/tests/bundles/focal-xena.yaml index 7ba242a5..590c4afb 100644 --- a/tests/distro-regression/tests/bundles/focal-xena.yaml +++ b/tests/distro-regression/tests/bundles/focal-xena.yaml @@ -2,6 +2,13 @@ variables: source: &source cloud:focal-xena/proposed openstack-origin: &openstack-origin cloud:focal-xena/proposed retrofit-uca-pocket: &retrofit-uca-pocket xena + openstack-channel: &openstack-channel wallaby/edge + ceph-channel: &ceph-channel pacific/edge + ovn-channel: &ovn-channel 21.09/edge + mysql-channel: &mysql-channel 8.0/edge + rabbitmq-channel: &rabbitmq-channel 3.8/edge + memcached-channel: &memcached-channel latest/edge + vault-channel: &vault-channel 1.7/edge series: &series focal applications: @@ -11,36 +18,36 @@ applications: options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel aodh-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel barbican: charm: ch:barbican num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel barbican-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ceilometer: charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel ceilometer-agent: charm: ch:ceilometer-agent - channel: xena/edge + channel: *openstack-channel ceph-fs: num_units: 1 charm: ch:ceph-fs options: source: *source - channel: pacific/edge + channel: *ceph-channel ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -48,16 +55,16 @@ applications: expected-osd-count: 3 source: *source constraints: mem=1024 - channel: pacific/edge + channel: *ceph-channel ceph-osd: charm: ch:ceph-osd num_units: 3 options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 - channel: pacific/edge + channel: *ceph-channel cinder: charm: ch:cinder num_units: 1 @@ -66,13 +73,13 @@ applications: glance-api-version: 2 openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel cinder-ceph: charm: ch:cinder-ceph - channel: xena/edge + channel: *openstack-channel cinder-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel designate: charm: ch:designate num_units: 1 @@ -84,42 +91,42 @@ applications: nova-domain-email: bob@serverstack.ubuntu.com openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel designate-bind: charm: ch:designate-bind num_units: 1 - channel: xena/edge + channel: *openstack-channel designate-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel glance-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel gnocchi: charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin - channel: xena/edge + channel: *openstack-channel gnocchi-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel heat: charm: ch:heat num_units: 1 options: openstack-origin: *openstack-origin - channel: xena/edge + channel: *openstack-channel heat-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel keystone: charm: ch:keystone num_units: 1 @@ -127,10 +134,22 @@ applications: admin-password: openstack openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel keystone-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -138,48 +157,48 @@ applications: default-share-backend: cephfsnfs1 share-protocols: NFS openstack-origin: *openstack-origin - channel: xena/edge + channel: *openstack-channel manila-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel manila-ganesha: charm: ch:manila-ganesha num_units: 1 options: openstack-origin: *openstack-origin - channel: xena/edge + channel: *openstack-channel manila-ganesha-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel memcached: charm: ch:memcached num_units: 1 constraints: mem=1024 - channel: latest/edge + channel: *memcached-channel mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 constraints: mem=4096 - channel: 8.0/edge + channel: *mysql-channel vault: charm: ch:vault num_units: 1 - channel: 1.7/edge + channel: *vault-channel vault-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ovn-central: charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: 21.09/edge + channel: *ovn-channel neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: xena/edge + channel: *openstack-channel ovn-chassis: charm: ch:ovn-chassis - channel: 21.09/edge + channel: *ovn-channel neutron-api: charm: ch:neutron-api num_units: 1 @@ -191,10 +210,10 @@ applications: enable-qos: true enable-vlan-trunking: true constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel neutron-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -202,7 +221,7 @@ applications: network-manager: Neutron openstack-origin: *openstack-origin constraints: mem=4096 - channel: xena/edge + channel: *openstack-channel nova-compute: charm: ch:nova-compute num_units: 3 @@ -212,34 +231,34 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin constraints: mem=4096 - channel: xena/edge + channel: *openstack-channel nova-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel openstack-dashboard: charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel placement: charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel placement-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 options: source: *source constraints: mem=1024 - channel: 3.8/edge + channel: *rabbitmq-channel swift-proxy: charm: ch:swift-proxy num_units: 1 @@ -249,7 +268,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae zone-assignment: manual constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel swift-storage-z1: charm: ch:swift-storage num_units: 1 @@ -259,7 +278,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel swift-storage-z2: charm: ch:swift-storage num_units: 1 @@ -269,7 +288,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel swift-storage-z3: charm: ch:swift-storage num_units: 1 @@ -279,7 +298,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: xena/edge + channel: *openstack-channel octavia: charm: ch:octavia num_units: 1 @@ -287,24 +306,24 @@ applications: openstack-origin: *openstack-origin spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' - channel: xena/edge + channel: *openstack-channel octavia-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: true constraints: root-disk=8G - channel: xena/edge + channel: *openstack-channel octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: *retrofit-uca-pocket - channel: xena/edge + channel: *openstack-channel relations: - - nova-cloud-controller:amqp - rabbitmq-server:amqp @@ -546,3 +565,15 @@ relations: - rabbitmq-server - - manila - keystone +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/focal-yoga-base.yaml b/tests/distro-regression/tests/bundles/focal-yoga-base.yaml deleted file mode 100644 index cf5e434c..00000000 --- a/tests/distro-regression/tests/bundles/focal-yoga-base.yaml +++ /dev/null @@ -1,315 +0,0 @@ -variables: - source: &source cloud:focal-yoga/proposed - openstack-origin: &openstack-origin cloud:focal-yoga/proposed - openstack-channel: &openstack-channel yoga/edge - ceph-channel: &ceph-channel quincy/edge - ovn-channel: &ovn-channel 22.03/edge - -series: &series focal -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: 8.0/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: 3.8/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/focal-yoga-magnum.yaml b/tests/distro-regression/tests/bundles/focal-yoga-magnum.yaml deleted file mode 120000 index 1b8c9294..00000000 --- a/tests/distro-regression/tests/bundles/focal-yoga-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -focal-yoga-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/focal-yoga.yaml b/tests/distro-regression/tests/bundles/focal-yoga.yaml index 30c03543..724d7f9f 100644 --- a/tests/distro-regression/tests/bundles/focal-yoga.yaml +++ b/tests/distro-regression/tests/bundles/focal-yoga.yaml @@ -2,6 +2,13 @@ variables: source: &source cloud:focal-yoga/proposed openstack-origin: &openstack-origin cloud:focal-yoga/proposed retrofit-uca-pocket: &retrofit-uca-pocket yoga + openstack-channel: &openstack-channel yoga/edge + ceph-channel: &ceph-channel quincy/edge + ovn-channel: &ovn-channel 22.03/edge + mysql-channel: &mysql-channel 8.0/edge + rabbitmq-channel: &rabbitmq-channel 3.8/edge + memcached-channel: &memcached-channel latest/edge + vault-channel: &vault-channel 1.7/edge series: &series focal applications: @@ -11,36 +18,36 @@ applications: options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel aodh-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel barbican: charm: ch:barbican num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel barbican-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ceilometer: charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel ceilometer-agent: charm: ch:ceilometer-agent - channel: yoga/edge + channel: *openstack-channel ceph-fs: num_units: 1 charm: ch:ceph-fs options: source: *source - channel: quincy/edge + channel: *ceph-channel ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -48,16 +55,16 @@ applications: expected-osd-count: 3 source: *source constraints: mem=1024 - channel: quincy/edge + channel: *ceph-channel ceph-osd: charm: ch:ceph-osd num_units: 3 options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 - channel: quincy/edge + channel: *ceph-channel cinder: charm: ch:cinder num_units: 1 @@ -66,13 +73,13 @@ applications: glance-api-version: 2 openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel cinder-ceph: charm: ch:cinder-ceph - channel: yoga/edge + channel: *openstack-channel cinder-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel designate: charm: ch:designate num_units: 1 @@ -84,42 +91,42 @@ applications: nova-domain-email: bob@serverstack.ubuntu.com openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel designate-bind: charm: ch:designate-bind num_units: 1 - channel: yoga/edge + channel: *openstack-channel designate-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel glance-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel gnocchi: charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin - channel: yoga/edge + channel: *openstack-channel gnocchi-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel heat: charm: ch:heat num_units: 1 options: openstack-origin: *openstack-origin - channel: yoga/edge + channel: *openstack-channel heat-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel keystone: charm: ch:keystone num_units: 1 @@ -127,10 +134,22 @@ applications: admin-password: openstack openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel keystone-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -138,48 +157,48 @@ applications: default-share-backend: cephfsnfs1 share-protocols: NFS openstack-origin: *openstack-origin - channel: yoga/edge + channel: *openstack-channel manila-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel manila-ganesha: charm: ch:manila-ganesha num_units: 1 options: openstack-origin: *openstack-origin - channel: yoga/edge + channel: *openstack-channel manila-ganesha-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel memcached: charm: ch:memcached num_units: 1 constraints: mem=1024 - channel: latest/edge + channel: *memcached-channel mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 constraints: mem=4096 - channel: 8.0/edge + channel: *mysql-channel vault: charm: ch:vault num_units: 1 - channel: 1.7/edge + channel: *vault-channel vault-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ovn-central: charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: 22.03/edge + channel: *ovn-channel neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: yoga/edge + channel: *openstack-channel ovn-chassis: charm: ch:ovn-chassis - channel: 22.03/edge + channel: *ovn-channel neutron-api: charm: ch:neutron-api num_units: 1 @@ -191,10 +210,10 @@ applications: enable-qos: true enable-vlan-trunking: true constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel neutron-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -202,7 +221,7 @@ applications: network-manager: Neutron openstack-origin: *openstack-origin constraints: mem=4096 - channel: yoga/edge + channel: *openstack-channel nova-compute: charm: ch:nova-compute num_units: 3 @@ -212,34 +231,34 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin constraints: mem=4096 - channel: yoga/edge + channel: *openstack-channel nova-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel openstack-dashboard: charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel placement: charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel placement-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 options: source: *source constraints: mem=1024 - channel: 3.8/edge + channel: *rabbitmq-channel swift-proxy: charm: ch:swift-proxy num_units: 1 @@ -249,7 +268,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae zone-assignment: manual constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel swift-storage-z1: charm: ch:swift-storage num_units: 1 @@ -259,7 +278,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel swift-storage-z2: charm: ch:swift-storage num_units: 1 @@ -269,7 +288,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel swift-storage-z3: charm: ch:swift-storage num_units: 1 @@ -279,7 +298,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel octavia: charm: ch:octavia num_units: 1 @@ -287,24 +306,24 @@ applications: openstack-origin: *openstack-origin spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' - channel: yoga/edge + channel: *openstack-channel octavia-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: true constraints: root-disk=8G - channel: yoga/edge + channel: *openstack-channel octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series retrofit-uca-pocket: *retrofit-uca-pocket - channel: yoga/edge + channel: *openstack-channel relations: - - nova-cloud-controller:amqp - rabbitmq-server:amqp @@ -546,3 +565,15 @@ relations: - rabbitmq-server - - manila - keystone +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/jammy-antelope-base.yaml b/tests/distro-regression/tests/bundles/jammy-antelope-base.yaml deleted file mode 100644 index 42e29609..00000000 --- a/tests/distro-regression/tests/bundles/jammy-antelope-base.yaml +++ /dev/null @@ -1,315 +0,0 @@ -variables: - source: &source cloud:jammy-antelope/proposed - openstack-origin: &openstack-origin cloud:jammy-antelope/proposed - openstack-channel: &openstack-channel latest/edge - ceph-channel: &ceph-channel latest/edge - ovn-channel: &ovn-channel latest/edge - -series: &series jammy -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: 8.0/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: 3.8/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/jammy-antelope-magnum.yaml b/tests/distro-regression/tests/bundles/jammy-antelope-magnum.yaml deleted file mode 120000 index 84e6ec94..00000000 --- a/tests/distro-regression/tests/bundles/jammy-antelope-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -jammy-antelope-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/jammy-antelope.yaml b/tests/distro-regression/tests/bundles/jammy-antelope.yaml index a497acea..967e4ee8 100644 --- a/tests/distro-regression/tests/bundles/jammy-antelope.yaml +++ b/tests/distro-regression/tests/bundles/jammy-antelope.yaml @@ -62,7 +62,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: *ceph-channel cinder: @@ -138,6 +138,18 @@ applications: keystone-mysql-router: charm: ch:mysql-router channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -570,11 +582,23 @@ relations: - rabbitmq-server - - manila - keystone -- - 'watcher:shared-db' - - 'watcher-mysql-router:shared-db' -- - 'watcher-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'keystone:identity-service' - - 'watcher:identity-service' -- - 'rabbitmq-server:amqp' - - 'watcher:amqp' +- - watcher:shared-db + - watcher-mysql-router:shared-db +- - watcher-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - keystone:identity-service + - watcher:identity-service +- - rabbitmq-server:amqp + - watcher:amqp +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/jammy-bobcat.yaml b/tests/distro-regression/tests/bundles/jammy-bobcat.yaml index 4edb9d08..205471dd 100644 --- a/tests/distro-regression/tests/bundles/jammy-bobcat.yaml +++ b/tests/distro-regression/tests/bundles/jammy-bobcat.yaml @@ -62,7 +62,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: *ceph-channel cinder: @@ -138,6 +138,18 @@ applications: keystone-mysql-router: charm: ch:mysql-router channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -301,7 +313,6 @@ applications: "weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60", "parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2" } - octavia: charm: ch:octavia num_units: 1 @@ -568,11 +579,23 @@ relations: - rabbitmq-server - - manila - keystone -- - 'watcher:shared-db' - - 'watcher-mysql-router:shared-db' -- - 'watcher-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'keystone:identity-service' - - 'watcher:identity-service' -- - 'rabbitmq-server:amqp' - - 'watcher:amqp' +- - watcher:shared-db + - watcher-mysql-router:shared-db +- - watcher-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - keystone:identity-service + - watcher:identity-service +- - rabbitmq-server:amqp + - watcher:amqp +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/jammy-yoga-base.yaml b/tests/distro-regression/tests/bundles/jammy-yoga-base.yaml deleted file mode 100644 index 27affe9c..00000000 --- a/tests/distro-regression/tests/bundles/jammy-yoga-base.yaml +++ /dev/null @@ -1,315 +0,0 @@ -variables: - source: &source proposed - openstack-origin: &openstack-origin distro-proposed - openstack-channel: &openstack-channel yoga/edge - ceph-channel: &ceph-channel quincy/edge - ovn-channel: &ovn-channel 22.03/edge - -series: &series jammy -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: 8.0/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: 3.9/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/jammy-yoga-magnum.yaml b/tests/distro-regression/tests/bundles/jammy-yoga-magnum.yaml deleted file mode 120000 index 8a3f6595..00000000 --- a/tests/distro-regression/tests/bundles/jammy-yoga-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -jammy-yoga-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/jammy-yoga.yaml b/tests/distro-regression/tests/bundles/jammy-yoga.yaml index f550fc1e..20453cee 100644 --- a/tests/distro-regression/tests/bundles/jammy-yoga.yaml +++ b/tests/distro-regression/tests/bundles/jammy-yoga.yaml @@ -1,6 +1,13 @@ variables: source: &source proposed openstack-origin: &openstack-origin distro-proposed + openstack-channel: &openstack-channel yoga/edge + ceph-channel: &ceph-channel quincy/edge + ovn-channel: &ovn-channel 22.03/edge + mysql-channel: &mysql-channel 8.0/edge + rabbitmq-channel: &rabbitmq-channel 3.9/edge + memcached-channel: &memcached-channel latest/edge + vault-channel: &vault-channel 1.7/edge series: &series jammy applications: @@ -10,36 +17,36 @@ applications: options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel aodh-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel barbican: charm: ch:barbican num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel barbican-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ceilometer: charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel ceilometer-agent: charm: ch:ceilometer-agent - channel: yoga/edge + channel: *openstack-channel ceph-fs: num_units: 1 charm: ch:ceph-fs options: source: *source - channel: quincy/edge + channel: *ceph-channel ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -47,16 +54,16 @@ applications: expected-osd-count: 3 source: *source constraints: mem=1024 - channel: quincy/edge + channel: *ceph-channel ceph-osd: charm: ch:ceph-osd num_units: 3 options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 - channel: quincy/edge + channel: *ceph-channel cinder: charm: ch:cinder num_units: 1 @@ -65,13 +72,13 @@ applications: glance-api-version: 2 openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel cinder-ceph: charm: ch:cinder-ceph - channel: yoga/edge + channel: *openstack-channel cinder-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel designate: charm: ch:designate num_units: 1 @@ -83,42 +90,42 @@ applications: nova-domain-email: bob@serverstack.ubuntu.com openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel designate-bind: charm: ch:designate-bind num_units: 1 - channel: yoga/edge + channel: *openstack-channel designate-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel glance-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel gnocchi: charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin - channel: yoga/edge + channel: *openstack-channel gnocchi-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel heat: charm: ch:heat num_units: 1 options: openstack-origin: *openstack-origin - channel: yoga/edge + channel: *openstack-channel heat-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel keystone: charm: ch:keystone num_units: 1 @@ -126,10 +133,22 @@ applications: admin-password: openstack openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel keystone-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -137,48 +156,48 @@ applications: default-share-backend: cephfsnfs1 share-protocols: NFS openstack-origin: *openstack-origin - channel: yoga/edge + channel: *openstack-channel manila-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel manila-ganesha: charm: ch:manila-ganesha num_units: 1 options: openstack-origin: *openstack-origin - channel: yoga/edge + channel: *openstack-channel manila-ganesha-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel memcached: charm: ch:memcached num_units: 1 constraints: mem=1024 - channel: latest/edge + channel: *memcached-channel mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 constraints: mem=4096 - channel: 8.0/edge + channel: *mysql-channel vault: charm: ch:vault num_units: 1 - channel: 1.7/edge + channel: *vault-channel vault-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel ovn-central: charm: ch:ovn-central num_units: 3 options: source: *openstack-origin - channel: 22.03/edge + channel: *ovn-channel neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: yoga/edge + channel: *openstack-channel ovn-chassis: charm: ch:ovn-chassis - channel: 22.03/edge + channel: *ovn-channel neutron-api: charm: ch:neutron-api num_units: 1 @@ -190,10 +209,10 @@ applications: enable-qos: true enable-vlan-trunking: true constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel neutron-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -201,7 +220,7 @@ applications: network-manager: Neutron openstack-origin: *openstack-origin constraints: mem=4096 - channel: yoga/edge + channel: *openstack-channel nova-compute: charm: ch:nova-compute num_units: 3 @@ -211,34 +230,34 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin constraints: mem=4096 - channel: yoga/edge + channel: *openstack-channel nova-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel openstack-dashboard: charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel placement: charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel placement-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 options: source: *source constraints: mem=1024 - channel: 3.9/edge + channel: *rabbitmq-channel swift-proxy: charm: ch:swift-proxy num_units: 1 @@ -248,7 +267,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae zone-assignment: manual constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel swift-storage-z1: charm: ch:swift-storage num_units: 1 @@ -258,7 +277,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel swift-storage-z2: charm: ch:swift-storage num_units: 1 @@ -268,7 +287,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel swift-storage-z3: charm: ch:swift-storage num_units: 1 @@ -278,7 +297,7 @@ applications: storage: block-devices: cinder,10G constraints: mem=1024 - channel: yoga/edge + channel: *openstack-channel octavia: charm: ch:octavia num_units: 1 @@ -286,23 +305,23 @@ applications: openstack-origin: *openstack-origin spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' - channel: yoga/edge + channel: *openstack-channel octavia-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: *mysql-channel glance-simplestreams-sync: charm: ch:glance-simplestreams-sync num_units: 1 options: use_swift: true constraints: root-disk=8G - channel: yoga/edge + channel: *openstack-channel octavia-diskimage-retrofit: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: *series - channel: yoga/edge + channel: *openstack-channel relations: - - nova-cloud-controller:amqp - rabbitmq-server:amqp @@ -544,3 +563,15 @@ relations: - rabbitmq-server - - manila - keystone +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/jammy-zed-base.yaml b/tests/distro-regression/tests/bundles/jammy-zed-base.yaml deleted file mode 100644 index 56902959..00000000 --- a/tests/distro-regression/tests/bundles/jammy-zed-base.yaml +++ /dev/null @@ -1,315 +0,0 @@ -variables: - source: &source cloud:jammy-zed/proposed - openstack-origin: &openstack-origin cloud:jammy-zed/proposed - openstack-channel: &openstack-channel zed/edge - ceph-channel: &ceph-channel quincy/edge - ovn-channel: &ovn-channel 22.09/edge - -series: &series jammy -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: 8.0/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: 3.9/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/jammy-zed-magnum.yaml b/tests/distro-regression/tests/bundles/jammy-zed-magnum.yaml deleted file mode 120000 index 56234039..00000000 --- a/tests/distro-regression/tests/bundles/jammy-zed-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -jammy-zed-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/jammy-zed.yaml b/tests/distro-regression/tests/bundles/jammy-zed.yaml index 95125a2e..51694d3c 100644 --- a/tests/distro-regression/tests/bundles/jammy-zed.yaml +++ b/tests/distro-regression/tests/bundles/jammy-zed.yaml @@ -62,7 +62,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: *ceph-channel cinder: @@ -138,6 +138,18 @@ applications: keystone-mysql-router: charm: ch:mysql-router channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -551,3 +563,15 @@ relations: - rabbitmq-server - - manila - keystone +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/lunar-antelope-base.yaml b/tests/distro-regression/tests/bundles/lunar-antelope-base.yaml deleted file mode 100644 index 683a4ed4..00000000 --- a/tests/distro-regression/tests/bundles/lunar-antelope-base.yaml +++ /dev/null @@ -1,316 +0,0 @@ -variables: - source: &source proposed - openstack-origin: &openstack-origin distro-proposed - openstack-channel: &openstack-channel latest/edge - ceph-channel: &ceph-channel latest/edge - ovn-channel: &ovn-channel latest/edge - -series: &series lunar -applications: - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *source - constraints: mem=1024 - channel: *ceph-channel - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *source - storage: - osd-devices: cinder,15G - constraints: mem=4096 - channel: *ceph-channel - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-channel - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - memcached: - charm: ch:memcached - num_units: 1 - constraints: mem=1024 - channel: latest/stable - series: jammy - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4096 - channel: latest/edge - vault: - charm: ch:vault - num_units: 1 - channel: 1.7/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: *ovn-channel - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: *openstack-channel - ovn-chassis: - charm: ch:ovn-chassis - channel: *ovn-channel - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - neutron-security-groups: true - flat-network-providers: physnet1 - openstack-origin: *openstack-origin - enable-ml2-port-security: true - enable-qos: true - enable-vlan-trunking: true - constraints: mem=1024 - channel: *openstack-channel - neutron-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - constraints: mem=2048 - channel: *openstack-channel - nova-compute: - charm: ch:nova-compute - num_units: 3 - options: - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - constraints: mem=4096 - channel: *openstack-channel - nova-mysql-router: - charm: ch:mysql-router - channel: latest/edge - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=1024 - channel: latest/edge - glance-simplestreams-sync: - charm: ch:glance-simplestreams-sync - num_units: 1 - options: - use_swift: true - constraints: root-disk=8G - channel: *openstack-channel - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - replicas: 3 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - zone-assignment: manual - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z1: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z2: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 2 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel - swift-storage-z3: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 3 - storage: - block-devices: cinder,10G - constraints: mem=1024 - channel: *openstack-channel -relations: -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:image-service - - glance:image-service -- - nova-compute:ceph - - ceph-mon:client -- - glance:identity-service - - keystone:identity-service -- - glance:ceph - - ceph-mon:client -- - glance:image-service - - cinder:image-service -- - glance:amqp - - rabbitmq-server:amqp -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:identity-service - - keystone:identity-service -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder-ceph:ceph - - ceph-mon:client -- - openstack-dashboard:identity-service - - keystone:identity-service -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - cinder-ceph:ceph-access - - nova-compute:ceph-access -- - placement:identity-service - - keystone:identity-service -- - placement:placement - - nova-cloud-controller:placement -- - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate -- - 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:certificates - - vault:certificates -- - ovn-chassis:ovsdb - - ovn-central:ovsdb -- - vault:certificates - - neutron-api-plugin-ovn:certificates -- - vault:certificates - - cinder:certificates -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault:certificates - - openstack-dashboard:certificates -- - 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 -- - cinder-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:shared-db - - vault-mysql-router:shared-db -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:shared-db - - nova-mysql-router:shared-db -- - glance:shared-db - - glance-mysql-router:shared-db -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - neutron-api:shared-db - - neutron-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - keystone:identity-service - - glance-simplestreams-sync:identity-service -- - vault:certificates - - glance-simplestreams-sync:certificates -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-proxy:swift-storage - - swift-storage-z1:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z2:swift-storage -- - swift-proxy:swift-storage - - swift-storage-z3:swift-storage -- - vault:certificates - - swift-proxy:certificates diff --git a/tests/distro-regression/tests/bundles/lunar-antelope-magnum.yaml b/tests/distro-regression/tests/bundles/lunar-antelope-magnum.yaml deleted file mode 120000 index c6ed2f54..00000000 --- a/tests/distro-regression/tests/bundles/lunar-antelope-magnum.yaml +++ /dev/null @@ -1 +0,0 @@ -lunar-antelope-base.yaml \ No newline at end of file diff --git a/tests/distro-regression/tests/bundles/lunar-antelope.yaml b/tests/distro-regression/tests/bundles/lunar-antelope.yaml index d94ee8c2..563e9363 100644 --- a/tests/distro-regression/tests/bundles/lunar-antelope.yaml +++ b/tests/distro-regression/tests/bundles/lunar-antelope.yaml @@ -76,7 +76,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: *ceph-channel cinder: @@ -152,6 +152,18 @@ applications: keystone-mysql-router: charm: ch:mysql-router channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -586,11 +598,23 @@ relations: - rabbitmq-server - - manila - keystone -- - 'watcher:shared-db' - - 'watcher-mysql-router:shared-db' -- - 'watcher-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'keystone:identity-service' - - 'watcher:identity-service' -- - 'rabbitmq-server:amqp' - - 'watcher:amqp' +- - watcher:shared-db + - watcher-mysql-router:shared-db +- - watcher-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - keystone:identity-service + - watcher:identity-service +- - rabbitmq-server:amqp + - watcher:amqp +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/mantic-bobcat.yaml b/tests/distro-regression/tests/bundles/mantic-bobcat.yaml index 15cb9e08..beb9ed1d 100644 --- a/tests/distro-regression/tests/bundles/mantic-bobcat.yaml +++ b/tests/distro-regression/tests/bundles/mantic-bobcat.yaml @@ -76,7 +76,7 @@ applications: options: source: *source storage: - osd-devices: cinder,15G + osd-devices: cinder,24G constraints: mem=4096 channel: *ceph-channel cinder: @@ -152,6 +152,18 @@ applications: keystone-mysql-router: charm: ch:mysql-router channel: *mysql-channel + magnum: + charm: ch:magnum + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: *openstack-channel + magnum-mysql-router: + charm: ch:mysql-router + channel: *mysql-channel + magnum-dashboard: + charm: ch:magnum-dashboard + channel: *openstack-channel manila: charm: ch:manila num_units: 1 @@ -583,11 +595,23 @@ relations: - rabbitmq-server - - manila - keystone -- - 'watcher:shared-db' - - 'watcher-mysql-router:shared-db' -- - 'watcher-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'keystone:identity-service' - - 'watcher:identity-service' -- - 'rabbitmq-server:amqp' - - 'watcher:amqp' +- - watcher:shared-db + - watcher-mysql-router:shared-db +- - watcher-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - keystone:identity-service + - watcher:identity-service +- - rabbitmq-server:amqp + - watcher:amqp +- - magnum:shared-db + - magnum-mysql-router:shared-db +- - magnum-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - magnum:amqp + - rabbitmq-server:amqp +- - magnum:identity-service + - keystone:identity-service +- - magnum:certificates + - vault:certificates +- - openstack-dashboard:dashboard-plugin + - magnum-dashboard:dashboard diff --git a/tests/distro-regression/tests/bundles/overlays/focal-ussuri-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/focal-ussuri-magnum.yaml.j2 deleted file mode 100644 index 80205209..00000000 --- a/tests/distro-regression/tests/bundles/overlays/focal-ussuri-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source proposed - openstack-origin: &openstack-origin distro-proposed - openstack-channel: &openstack-channel ussuri/edge - -series: &series focal -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/bundles/overlays/focal-victoria-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/focal-victoria-magnum.yaml.j2 deleted file mode 100644 index a132332e..00000000 --- a/tests/distro-regression/tests/bundles/overlays/focal-victoria-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source cloud:focal-victoria/proposed - openstack-origin: &openstack-origin cloud:focal-victoria/proposed - openstack-channel: &openstack-channel victoria/edge - -series: &series focal -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/bundles/overlays/focal-wallaby-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/focal-wallaby-magnum.yaml.j2 deleted file mode 100644 index 3076b906..00000000 --- a/tests/distro-regression/tests/bundles/overlays/focal-wallaby-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source cloud:focal-wallaby/proposed - openstack-origin: &openstack-origin cloud:focal-wallaby/proposed - openstack-channel: &openstack-channel wallaby/edge - -series: &series focal -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/bundles/overlays/focal-xena-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/focal-xena-magnum.yaml.j2 deleted file mode 100644 index f5ab1c4f..00000000 --- a/tests/distro-regression/tests/bundles/overlays/focal-xena-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source cloud:focal-xena/proposed - openstack-origin: &openstack-origin cloud:focal-xena/proposed - openstack-channel: &openstack-channel xena/edge - -series: &series focal -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/bundles/overlays/focal-yoga-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/focal-yoga-magnum.yaml.j2 deleted file mode 100644 index 721e18ba..00000000 --- a/tests/distro-regression/tests/bundles/overlays/focal-yoga-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source cloud:focal-yoga/proposed - openstack-origin: &openstack-origin cloud:focal-yoga/proposed - openstack-channel: &openstack-channel yoga/edge - -series: &series focal -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/bundles/overlays/jammy-antelope-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/jammy-antelope-magnum.yaml.j2 deleted file mode 100644 index 18127e9d..00000000 --- a/tests/distro-regression/tests/bundles/overlays/jammy-antelope-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source cloud:jammy-antelope/proposed - openstack-origin: &openstack-origin cloud:jammy-antelope/proposed - openstack-channel: &openstack-channel latest/edge - -series: &series jammy -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/bundles/overlays/jammy-yoga-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/jammy-yoga-magnum.yaml.j2 deleted file mode 100644 index 41335c54..00000000 --- a/tests/distro-regression/tests/bundles/overlays/jammy-yoga-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source proposed - openstack-origin: &openstack-origin distro-proposed - openstack-channel: &openstack-channel yoga/edge - -series: &series jammy -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/bundles/overlays/jammy-zed-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/jammy-zed-magnum.yaml.j2 deleted file mode 100644 index f9b31ad1..00000000 --- a/tests/distro-regression/tests/bundles/overlays/jammy-zed-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source cloud:jammy-zed/proposed - openstack-origin: &openstack-origin cloud:jammy-zed/proposed - openstack-channel: &openstack-channel zed/edge - -series: &series jammy -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/bundles/overlays/lunar-antelope-magnum.yaml.j2 b/tests/distro-regression/tests/bundles/overlays/lunar-antelope-magnum.yaml.j2 deleted file mode 100644 index e36b31e6..00000000 --- a/tests/distro-regression/tests/bundles/overlays/lunar-antelope-magnum.yaml.j2 +++ /dev/null @@ -1,84 +0,0 @@ -# -*- mode: yaml -*- -variables: - source: &source proposed - openstack-origin: &openstack-origin distro-proposed - openstack-channel: &openstack-channel latest/edge - -series: &series lunar -applications: - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - constraints: mem=1024 - channel: *openstack-channel - barbican-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - heat-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum: - charm: ch:magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: *openstack-channel - magnum-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - magnum-dashboard: - charm: ch:magnum-dashboard - channel: *openstack-channel - - # these applications are defined in the main bundle, they are defined here - # to allow them to be referenced in the relation within this overlay - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - keystone: - charm: ch:keystone - vault: - charm: ch:vault - openstack-dashboard: - charm: ch:openstack-dashboard - -relations: -- - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' -- - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'magnum:amqp' - - 'rabbitmq-server:amqp' -- - 'magnum:identity-service' - - 'keystone:identity-service' -- - 'magnum:certificates' - - 'vault:certificates' -- - 'heat:amqp' - - 'rabbitmq-server:amqp' -- - 'heat:identity-service' - - 'keystone:identity-service' -- - 'heat:shared-db' - - 'heat-mysql-router:shared-db' -- - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'heat:certificates' - - 'vault:certificates' -- - 'barbican:amqp' - - 'rabbitmq-server:amqp' -- - 'barbican:identity-service' - - 'keystone:identity-service' -- - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' -- - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'barbican:certificates' - - 'vault:certificates' -- - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/tests/distro-regression/tests/tests.yaml b/tests/distro-regression/tests/tests.yaml index a73beba3..f4a27d41 100644 --- a/tests/distro-regression/tests/tests.yaml +++ b/tests/distro-regression/tests/tests.yaml @@ -16,15 +16,6 @@ smoke_bundles: - keystone_v3_smoke_focal: jammy-bobcat - keystone_v3_smoke_focal: lunar-antelope - keystone_v3_smoke_focal: mantic-bobcat - - keystone_v3_smoke_focal_magnum: focal-ussuri-magnum - - keystone_v3_smoke_focal_magnum: focal-victoria-magnum - - keystone_v3_smoke_focal_magnum: focal-wallaby-magnum - - keystone_v3_smoke_focal_magnum: focal-xena-magnum - - keystone_v3_smoke_focal_magnum: focal-yoga-magnum - - keystone_v3_smoke_focal_magnum: jammy-yoga-magnum - - keystone_v3_smoke_focal_magnum: jammy-zed-magnum - - keystone_v3_smoke_focal_magnum: jammy-antelope-magnum - - keystone_v3_smoke_focal_magnum: lunar-antelope-magnum - keystone_v3_smoke_security: bionic-queens-security - keystone_v3_smoke_focal_security: focal-ussuri-security - keystone_v3_smoke_focal_security: jammy-yoga-security @@ -75,21 +66,9 @@ configure: - zaza.openstack.charm_tests.glance.setup.add_cirros_image - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image - zaza.openstack.charm_tests.octavia.setup.centralized_fip_network - - keystone_v3_smoke_focal_security: *configure_focal_and_later - - keystone_v3_smoke_focal_magnum: - - zaza.openstack.charm_tests.vault.setup.auto_initialize - - zaza.openstack.charm_tests.glance_simplestreams_sync.setup.sync_images - - zaza.openstack.charm_tests.glance.setup.add_lts_image - - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network - - zaza.openstack.charm_tests.nova.setup.create_flavors - - zaza.openstack.charm_tests.nova.setup.manage_ssh_key - - zaza.openstack.charm_tests.keystone.setup.add_demo_user - - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles - - zaza.openstack.charm_tests.glance.setup.add_cirros_image - - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image - - zaza.openstack.charm_tests.heat.setup.domain_setup - zaza.openstack.charm_tests.magnum.setup.domain_setup - zaza.openstack.charm_tests.magnum.setup.add_image + - keystone_v3_smoke_focal_security: *configure_focal_and_later tests: - keystone_v2_smoke: - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV2 @@ -105,8 +84,6 @@ tests: - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3 - keystone_v3_smoke_focal_security: - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3 - - keystone_v3_smoke_focal_magnum: - - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3 tests_options: keystone_v3_smoke_security: overlay_ppas: @@ -128,17 +105,26 @@ tests_options: keystone_v3_smoke_stein: smoke: True keystone_v3_smoke_focal: - smoke: True + #smoke: True include-list: - - "manila_tempest_tests.tests.api.admin.test_admin_actions.AdminActionsTest.*" - - "manila_tempest_tests.tests.api.admin.test_share_instances.ShareInstancesTest.*" - - "manila_tempest_tests.tests.api.admin.test_share_snapshot_instances.ShareSnapshotInstancesTest.*" - - "manila_tempest_tests.tests.api.admin.test_share_types.ShareTypesAdminTest.*" - - "manila_tempest_tests.tests.api.admin.test_shares_actions.SharesActionsAdminTest.*" + #- "manila_tempest_tests.tests.api.admin.test_admin_actions.AdminActionsTest.*" + #- "manila_tempest_tests.tests.api.admin.test_share_instances.ShareInstancesTest.*" + #- "manila_tempest_tests.tests.api.admin.test_share_snapshot_instances.ShareSnapshotInstancesTest.*" + #- "manila_tempest_tests.tests.api.admin.test_share_types.ShareTypesAdminTest.*" + #- "manila_tempest_tests.tests.api.admin.test_shares_actions.SharesActionsAdminTest.*" + #- "magnum_tempest_plugin.tests.api.v1.test_cluster" + #- "magnum_tempest_plugin.tests.api.v1.test_cluster_template" + #- "magnum_tempest_plugin.tests.api.v1.test_cluster_template_admin" + #- "magnum_tempest_plugin.tests.api.v1.test_magnum_service" # Note(coreycb): Disable watcher tests until all the failures can be debugged. # - "watcher_tempest_plugin.tests.api" # - "watcher_tempest_plugin.tests.scenario.test_execute_host_maintenance" # - "watcher_tempest_plugin.tests.scenario.test_execute_vm_workload_consolidation" + - "tempest.api.object_storage.test_container_quotas.ContainerQuotasTest" + - "designate_tempest_plugin.tests.scenario.v2.test_zones.ZonesTest" + - "magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_nonexisting_flavor" + - "magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_zero_nodes" + - "magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_list_sign_delete_clusters" exclude-list: # Exclude the known failures due to issues with octavia/manila policy - "manila_tempest_tests.tests.api.admin.test_share_networks.ShareNetworkAdminTest" @@ -154,19 +140,18 @@ tests_options: - "manila_tempest_tests.tests.api.admin.test_share_snapshot_instances.ShareSnapshotInstancesTest.*" - "manila_tempest_tests.tests.api.admin.test_share_types.ShareTypesAdminTest.*" - "manila_tempest_tests.tests.api.admin.test_shares_actions.SharesActionsAdminTest.*" - exclude-list: - # Exclude the known failures due to issues with octavia/manila policy - - "manila_tempest_tests.tests.api.admin.test_share_networks.ShareNetworkAdminTest" - - "manila_tempest_tests.tests.api.test_share_networks.ShareNetworksTest" - - "octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops.TrafficOperationsScenarioTest" - keystone_v3_smoke_focal_magnum: - smoke: True - include-list: - "magnum_tempest_plugin.tests.api.v1.test_cluster" - "magnum_tempest_plugin.tests.api.v1.test_cluster_template" - "magnum_tempest_plugin.tests.api.v1.test_cluster_template_admin" - "magnum_tempest_plugin.tests.api.v1.test_magnum_service" + # Note(coreycb): Disable watcher tests until all the failures can be debugged. + # - "watcher_tempest_plugin.tests.api" + # - "watcher_tempest_plugin.tests.scenario.test_execute_host_maintenance" + # - "watcher_tempest_plugin.tests.scenario.test_execute_vm_workload_consolidation" exclude-list: + # Exclude the known failures due to issues with octavia/manila policy + - "manila_tempest_tests.tests.api.admin.test_share_networks.ShareNetworkAdminTest" + - "manila_tempest_tests.tests.api.test_share_networks.ShareNetworksTest" # Implemented on container-infra 1.10 which is available in >=Xena # https://opendev.org/openstack/magnum/commit/0e6d17893 # https://opendev.org/openstack/magnum-tempest-plugin/commit/b68a678f37de0a769e7ee8dbefa9bdfe6cf445cc @@ -175,8 +160,9 @@ tests_options: # The test expects a 400 error while the server returns a 401 error due to glance # See logs at https://pastebin.ubuntu.com/p/V3DMcVmtyF/ - "magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_nonexisting_flavor" - exclude-regex: - - "^(octavia_tempest_plugin|manila_tempest_tests|designate_tempest_plugin)\\..*" + - "octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops.TrafficOperationsScenarioTest" + # Note(coreycb): Disable watcher tests until all the failures can be debugged. + - "watcher_tempest_plugin.*" force_deploy: - bionic-queens - bionic-rocky