From cf3ea664fad0b9f9402fa354adf94071b904409c Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Fri, 19 Jan 2024 16:46:20 -0300
Subject: [PATCH 1/2] Add OpenStack 2024.1 (Caracal) testing bundles

---
 .../tests/bundles/jammy-caracal.yaml          | 604 +++++++++++++++++
 .../tests/bundles/noble-caracal-security.yaml |   1 +
 .../tests/bundles/noble-caracal.yaml          | 608 ++++++++++++++++++
 tests/distro-regression/tests/tests.yaml      |   4 +
 4 files changed, 1217 insertions(+)
 create mode 100644 tests/distro-regression/tests/bundles/jammy-caracal.yaml
 create mode 120000 tests/distro-regression/tests/bundles/noble-caracal-security.yaml
 create mode 100644 tests/distro-regression/tests/bundles/noble-caracal.yaml

diff --git a/tests/distro-regression/tests/bundles/jammy-caracal.yaml b/tests/distro-regression/tests/bundles/jammy-caracal.yaml
new file mode 100644
index 00000000..f9fedcd5
--- /dev/null
+++ b/tests/distro-regression/tests/bundles/jammy-caracal.yaml
@@ -0,0 +1,604 @@
+variables:
+  source: &source cloud:jammy-caracal/proposed
+  openstack-origin: &openstack-origin cloud:jammy-caracal/proposed
+  retrofit-uca-pocket: &retrofit-uca-pocket caracal
+  openstack-channel: &openstack-channel 2024.1/edge
+  ceph-channel: &ceph-channel reef/edge
+  ovn-channel: &ovn-channel 24.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.8/edge
+
+series: &series jammy
+applications:
+  aodh:
+    charm: ch:aodh
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    constraints: mem=1024
+    channel: *openstack-channel
+  aodh-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  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: *mysql-channel
+  ceilometer:
+    charm: ch:ceilometer
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    constraints: mem=1024
+    channel: *openstack-channel
+  ceilometer-agent:
+    charm: ch:ceilometer-agent
+    channel: *openstack-channel
+  ceph-fs:
+    num_units: 1
+    charm: ch:ceph-fs
+    options:
+      source: *source
+    channel: *ceph-channel
+  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,24G
+    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: *mysql-channel
+  designate:
+    charm: ch:designate
+    num_units: 1
+    options:
+      nameservers: ns1.ubuntu.com.
+      neutron-domain: serverstack.ubuntu.com.
+      neutron-domain-email: bob@serverstack.ubuntu.com
+      nova-domain: serverstack.ubuntu.com.
+      nova-domain-email: bob@serverstack.ubuntu.com
+      openstack-origin: *openstack-origin
+    constraints: mem=1024
+    channel: *openstack-channel
+  designate-bind:
+    charm: ch:designate-bind
+    num_units: 1
+    channel: *openstack-channel
+  designate-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  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: *mysql-channel
+  gnocchi:
+    charm: ch:gnocchi
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    channel: *openstack-channel
+  gnocchi-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  heat:
+    charm: ch:heat
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    channel: *openstack-channel
+  heat-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  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: *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
+    options:
+      default-share-backend: cephfsnfs1
+      share-protocols: NFS
+      openstack-origin: *openstack-origin
+    channel: *openstack-channel
+  manila-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  manila-ganesha:
+    charm: ch:manila-ganesha
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    channel: *openstack-channel
+  manila-ganesha-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  memcached:
+    charm: ch:memcached
+    num_units: 1
+    constraints: mem=1024
+    channel: *memcached-channel
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    constraints: mem=4096
+    channel: *mysql-channel
+  vault:
+    charm: ch:vault
+    num_units: 1
+    channel: *vault-channel
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  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: *mysql-channel
+  nova-cloud-controller:
+    charm: ch:nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    constraints: mem=4096
+    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: *mysql-channel
+  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: *mysql-channel
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    constraints: mem=1024
+    channel: *rabbitmq-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
+  watcher-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  watcher:
+    charm: ch:watcher
+    channel: *openstack-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      datasources: gnocchi
+      planner: weight
+      planner-config: >
+        {
+            "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
+    options:
+      openstack-origin: *openstack-origin
+      spare-pool-size: 2
+      loadbalancer-topology: 'ACTIVE_STANDBY'
+    constraints: mem=4096
+    channel: *openstack-channel
+  octavia-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  glance-simplestreams-sync:
+    charm: ch:glance-simplestreams-sync
+    num_units: 1
+    options:
+      use_swift: true
+    constraints: root-disk=8G
+    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: *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
+- - 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
+- - ceilometer:identity-service
+  - keystone:identity-service
+- - ceilometer:amqp
+  - rabbitmq-server:amqp
+- - ceilometer-agent:nova-ceilometer
+  - nova-compute:nova-ceilometer
+- - ceilometer-agent:ceilometer-service
+  - ceilometer:ceilometer-service
+- - ceilometer-agent:amqp
+  - rabbitmq-server:amqp
+- - heat:identity-service
+  - keystone:identity-service
+- - heat:amqp
+  - rabbitmq-server:amqp
+- - neutron-api:amqp
+  - rabbitmq-server:amqp
+- - neutron-api:neutron-api
+  - nova-cloud-controller:neutron-api
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - ceph-mon
+  - ceph-fs
+- - ceph-osd:mon
+  - ceph-mon:osd
+- - aodh:amqp
+  - rabbitmq-server:amqp
+- - aodh:identity-service
+  - keystone:identity-service
+- - designate:identity-service
+  - keystone:identity-service
+- - designate:amqp
+  - rabbitmq-server:amqp
+- - designate:dns-backend
+  - designate-bind:dns-backend
+- - designate:coordinator-memcached
+  - memcached:cache
+- - gnocchi:storage-ceph
+  - ceph-mon:client
+- - gnocchi:amqp
+  - rabbitmq-server:amqp
+- - gnocchi:coordinator-memcached
+  - memcached:cache
+- - gnocchi:metric-service
+  - ceilometer:metric-service
+- - gnocchi:identity-service
+  - keystone:identity-service
+- - cinder-ceph:ceph-access
+  - nova-compute:ceph-access
+- - ceilometer:identity-credentials
+  - keystone:identity-credentials
+- - designate:dnsaas
+  - neutron-api:external-dns
+- - barbican:amqp
+  - rabbitmq-server:amqp
+- - barbican:identity-service
+  - keystone:identity-service
+- - 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
+- - ovn-chassis:ovsdb-subordinate
+  - octavia:ovsdb-subordinate
+- - ovn-central:ovsdb-cms
+  - octavia:ovsdb-cms
+- - vault:certificates
+  - aodh:certificates
+- - vault:certificates
+  - barbican:certificates
+- - vault:certificates
+  - ceilometer:certificates
+- - vault:certificates
+  - designate:certificates
+- - vault:certificates
+  - gnocchi:certificates
+- - vault:certificates
+  - heat:certificates
+- - vault:certificates
+  - neutron-api-plugin-ovn:certificates
+- - vault:certificates
+  - cinder:certificates
+- - vault:certificates
+  - glance:certificates
+- - vault:certificates
+  - keystone:certificates
+- - vault:certificates
+  - manila:certificates
+- - vault:certificates
+  - nova-cloud-controller:certificates
+- - vault:certificates
+  - placement:certificates
+- - vault:certificates
+  - swift-proxy: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
+- - heat-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - neutron-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - aodh-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - designate-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - gnocchi-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - barbican-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
+- - heat:shared-db
+  - heat-mysql-router:shared-db
+- - neutron-api:shared-db
+  - neutron-mysql-router:shared-db
+- - aodh:shared-db
+  - aodh-mysql-router:shared-db
+- - designate:shared-db
+  - designate-mysql-router:shared-db
+- - gnocchi:shared-db
+  - gnocchi-mysql-router:shared-db
+- - barbican:shared-db
+  - barbican-mysql-router:shared-db
+- - placement:shared-db
+  - placement-mysql-router:shared-db
+- - vault-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - octavia-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - octavia-mysql-router:shared-db
+  - octavia:shared-db
+- - keystone:identity-service
+  - octavia:identity-service
+- - rabbitmq-server:amqp
+  - octavia:amqp
+- - neutron-api:neutron-load-balancer
+  - octavia:neutron-api
+- - glance-simplestreams-sync:juju-info
+  - octavia-diskimage-retrofit:juju-info
+- - keystone:identity-service
+  - glance-simplestreams-sync:identity-service
+- - keystone:identity-credentials
+  - octavia-diskimage-retrofit:identity-credentials
+- - vault:certificates
+  - octavia:certificates
+- - vault:certificates
+  - octavia-diskimage-retrofit:certificates
+- - vault:certificates
+  - glance-simplestreams-sync:certificates
+- - ceph-mon
+  - manila-ganesha
+- - manila:shared-db
+  - manila-mysql-router:shared-db
+- - manila-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - manila-ganesha
+  - rabbitmq-server
+- - manila-ganesha
+  - keystone
+- - manila
+  - manila-ganesha
+- - manila-ganesha:shared-db
+  - manila-ganesha-mysql-router:shared-db
+- - manila-ganesha-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - manila
+  - rabbitmq-server
+- - manila
+  - keystone
+- - watcher:shared-db
+  - watcher-mysql-router:shared-db
+- - watcher-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - watcher:certificates
+  - vault:certificates
+- - 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/noble-caracal-security.yaml b/tests/distro-regression/tests/bundles/noble-caracal-security.yaml
new file mode 120000
index 00000000..c9cf2d47
--- /dev/null
+++ b/tests/distro-regression/tests/bundles/noble-caracal-security.yaml
@@ -0,0 +1 @@
+noble-caracal.yaml
\ No newline at end of file
diff --git a/tests/distro-regression/tests/bundles/noble-caracal.yaml b/tests/distro-regression/tests/bundles/noble-caracal.yaml
new file mode 100644
index 00000000..139671f8
--- /dev/null
+++ b/tests/distro-regression/tests/bundles/noble-caracal.yaml
@@ -0,0 +1,608 @@
+variables:
+  source: &source proposed
+  openstack-origin: &openstack-origin distro-proposed
+  # Set retrofit-series to jammy because noble images aren't
+  # available by default.
+  retrofit-series: &retrofit-series jammy
+  openstack-channel: &openstack-channel latest/edge
+  ceph-channel: &ceph-channel latest/edge
+  ovn-channel: &ovn-channel latest/edge
+  mysql-channel: &mysql-channel latest/edge
+  rabbitmq-channel: &rabbitmq-channel latest/edge
+  memcached-channel: &memcached-channel latest/edge
+  vault-channel: &vault-channel latest/edge
+
+series: &series noble
+applications:
+  aodh:
+    charm: ch:aodh
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    constraints: mem=1024
+    channel: *openstack-channel
+  aodh-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  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: *mysql-channel
+  ceilometer:
+    charm: ch:ceilometer
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    constraints: mem=1024
+    channel: *openstack-channel
+  ceilometer-agent:
+    charm: ch:ceilometer-agent
+    channel: *openstack-channel
+  ceph-fs:
+    num_units: 1
+    charm: ch:ceph-fs
+    options:
+      source: *source
+    channel: *ceph-channel
+  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,24G
+    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: *mysql-channel
+  designate:
+    charm: ch:designate
+    num_units: 1
+    options:
+      nameservers: ns1.ubuntu.com.
+      neutron-domain: serverstack.ubuntu.com.
+      neutron-domain-email: bob@serverstack.ubuntu.com
+      nova-domain: serverstack.ubuntu.com.
+      nova-domain-email: bob@serverstack.ubuntu.com
+      openstack-origin: *openstack-origin
+    constraints: mem=1024
+    channel: *openstack-channel
+  designate-bind:
+    charm: ch:designate-bind
+    num_units: 1
+    channel: *openstack-channel
+  designate-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  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: *mysql-channel
+  gnocchi:
+    charm: ch:gnocchi
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    channel: *openstack-channel
+  gnocchi-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  heat:
+    charm: ch:heat
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    channel: *openstack-channel
+  heat-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  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: *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
+    options:
+      default-share-backend: cephfsnfs1
+      share-protocols: NFS
+      openstack-origin: *openstack-origin
+    channel: *openstack-channel
+  manila-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  manila-ganesha:
+    charm: ch:manila-ganesha
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    channel: *openstack-channel
+  manila-ganesha-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  memcached:
+    charm: ch:memcached
+    num_units: 1
+    constraints: mem=1024
+    channel: *memcached-channel
+    series: jammy
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    constraints: mem=4096
+    channel: *mysql-channel
+  vault:
+    charm: ch:vault
+    num_units: 1
+    channel: *vault-channel
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  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: *mysql-channel
+  nova-cloud-controller:
+    charm: ch:nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    constraints: mem=4096
+    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: *mysql-channel
+  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: *mysql-channel
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    options:
+      source: *source
+    constraints: mem=1024
+    channel: *rabbitmq-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
+  watcher-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  watcher:
+    charm: ch:watcher
+    channel: *openstack-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      datasources: gnocchi
+      planner: weight
+      planner-config: >
+        {
+            "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
+    options:
+      openstack-origin: *openstack-origin
+      spare-pool-size: 2
+      loadbalancer-topology: 'ACTIVE_STANDBY'
+    constraints: mem=4096
+    channel: *openstack-channel
+  octavia-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-channel
+  glance-simplestreams-sync:
+    charm: ch:glance-simplestreams-sync
+    num_units: 1
+    options:
+      use_swift: true
+    constraints: root-disk=8G
+    channel: *openstack-channel
+  octavia-diskimage-retrofit:
+    charm: ch:octavia-diskimage-retrofit
+    options:
+      amp-image-tag: 'octavia-amphora'
+      retrofit-series: *retrofit-series
+    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
+- - 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
+- - ceilometer:identity-service
+  - keystone:identity-service
+- - ceilometer:amqp
+  - rabbitmq-server:amqp
+- - ceilometer-agent:nova-ceilometer
+  - nova-compute:nova-ceilometer
+- - ceilometer-agent:ceilometer-service
+  - ceilometer:ceilometer-service
+- - ceilometer-agent:amqp
+  - rabbitmq-server:amqp
+- - heat:identity-service
+  - keystone:identity-service
+- - heat:amqp
+  - rabbitmq-server:amqp
+- - neutron-api:amqp
+  - rabbitmq-server:amqp
+- - neutron-api:neutron-api
+  - nova-cloud-controller:neutron-api
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - ceph-mon
+  - ceph-fs
+- - ceph-osd:mon
+  - ceph-mon:osd
+- - aodh:amqp
+  - rabbitmq-server:amqp
+- - aodh:identity-service
+  - keystone:identity-service
+- - designate:identity-service
+  - keystone:identity-service
+- - designate:amqp
+  - rabbitmq-server:amqp
+- - designate:dns-backend
+  - designate-bind:dns-backend
+- - designate:coordinator-memcached
+  - memcached:cache
+- - gnocchi:storage-ceph
+  - ceph-mon:client
+- - gnocchi:amqp
+  - rabbitmq-server:amqp
+- - gnocchi:coordinator-memcached
+  - memcached:cache
+- - gnocchi:metric-service
+  - ceilometer:metric-service
+- - gnocchi:identity-service
+  - keystone:identity-service
+- - cinder-ceph:ceph-access
+  - nova-compute:ceph-access
+- - ceilometer:identity-credentials
+  - keystone:identity-credentials
+- - designate:dnsaas
+  - neutron-api:external-dns
+- - barbican:amqp
+  - rabbitmq-server:amqp
+- - barbican:identity-service
+  - keystone:identity-service
+- - 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
+- - ovn-chassis:ovsdb-subordinate
+  - octavia:ovsdb-subordinate
+- - ovn-central:ovsdb-cms
+  - octavia:ovsdb-cms
+- - vault:certificates
+  - aodh:certificates
+- - vault:certificates
+  - barbican:certificates
+- - vault:certificates
+  - ceilometer:certificates
+- - vault:certificates
+  - designate:certificates
+- - vault:certificates
+  - gnocchi:certificates
+- - vault:certificates
+  - heat:certificates
+- - vault:certificates
+  - neutron-api-plugin-ovn:certificates
+- - vault:certificates
+  - cinder:certificates
+- - vault:certificates
+  - glance:certificates
+- - vault:certificates
+  - keystone:certificates
+- - vault:certificates
+  - manila:certificates
+- - vault:certificates
+  - nova-cloud-controller:certificates
+- - vault:certificates
+  - placement:certificates
+- - vault:certificates
+  - swift-proxy: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
+- - heat-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - neutron-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - aodh-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - designate-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - gnocchi-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - barbican-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
+- - heat:shared-db
+  - heat-mysql-router:shared-db
+- - neutron-api:shared-db
+  - neutron-mysql-router:shared-db
+- - aodh:shared-db
+  - aodh-mysql-router:shared-db
+- - designate:shared-db
+  - designate-mysql-router:shared-db
+- - gnocchi:shared-db
+  - gnocchi-mysql-router:shared-db
+- - barbican:shared-db
+  - barbican-mysql-router:shared-db
+- - placement:shared-db
+  - placement-mysql-router:shared-db
+- - vault-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - octavia-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - octavia-mysql-router:shared-db
+  - octavia:shared-db
+- - keystone:identity-service
+  - octavia:identity-service
+- - rabbitmq-server:amqp
+  - octavia:amqp
+- - neutron-api:neutron-load-balancer
+  - octavia:neutron-api
+- - glance-simplestreams-sync:juju-info
+  - octavia-diskimage-retrofit:juju-info
+- - keystone:identity-service
+  - glance-simplestreams-sync:identity-service
+- - keystone:identity-credentials
+  - octavia-diskimage-retrofit:identity-credentials
+- - vault:certificates
+  - octavia:certificates
+- - vault:certificates
+  - octavia-diskimage-retrofit:certificates
+- - vault:certificates
+  - glance-simplestreams-sync:certificates
+- - ceph-mon
+  - manila-ganesha
+- - manila:shared-db
+  - manila-mysql-router:shared-db
+- - manila-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - manila-ganesha
+  - rabbitmq-server
+- - manila-ganesha
+  - keystone
+- - manila
+  - manila-ganesha
+- - manila-ganesha:shared-db
+  - manila-ganesha-mysql-router:shared-db
+- - manila-ganesha-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - manila
+  - rabbitmq-server
+- - manila
+  - keystone
+- - watcher:shared-db
+  - watcher-mysql-router:shared-db
+- - watcher-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - watcher:certificates
+  - vault:certificates
+- - 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/tests.yaml b/tests/distro-regression/tests/tests.yaml
index c02c90ee..42fb3432 100644
--- a/tests/distro-regression/tests/tests.yaml
+++ b/tests/distro-regression/tests/tests.yaml
@@ -12,13 +12,16 @@ smoke_bundles:
   - focal_wallaby: jammy-zed
   - focal_wallaby: jammy-antelope
   - focal_wallaby: jammy-bobcat
+  - focal_wallaby: jammy-caracal
   - focal_wallaby: lunar-antelope
   - focal_wallaby: mantic-bobcat
+  - focal_wallaby: noble-caracal
   - bionic_queens_security: bionic-queens-security
   - focal_ussuri_security: focal-ussuri-security
   - focal_ussuri_security: jammy-yoga-security
   - focal_ussuri_security: lunar-antelope-security
   - focal_ussuri_security: mantic-bobcat-security
+  - focal_ussuri_security: noble-caracal-security
   - focal_upgrades: focal-ussuri-to-yoga-upgrades
   - jammy_upgrades: jammy-yoga-to-caracal-upgrades
 configure:
@@ -217,6 +220,7 @@ tests_options:
     - bionic-ussuri
     - lunar-antelope
     - mantic-bobcat
+    - noble-caracal
 target_deploy_status:
   ceilometer:
     workload-status: blocked

From 106819f1ed65f687f0e14e33a6298f65db3e6b45 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Fri, 19 Jan 2024 16:56:37 -0300
Subject: [PATCH 2/2] Add Caracal jobs to osci.yaml

---
 osci.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osci.yaml b/osci.yaml
index 53bca3c4..cc81dacc 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -17,8 +17,10 @@
       - cot_distro-regression_jammy-zed
       - cot_distro-regression_jammy-antelope
       - cot_distro-regression_jammy-bobcat
+      - cot_distro-regression_jammy-caracal
       - cot_distro-regression_lunar-antelope
       - cot_distro-regression_mantic-bobcat
+      - cot_distro-regression_noble-caracal
       - cot_distro-regression_bionic-queens-security
       - cot_distro-regression_focal-ussuri-security
       - cot_distro-regression_jammy-yoga-security
@@ -95,6 +97,11 @@
     parent: cot-func-target
     vars:
       tox_extra_args: '-- jammy-bobcat'
+- job:
+    name: cot_distro-regression_jammy-caracal
+    parent: cot-func-target
+    vars:
+      tox_extra_args: '-- jammy-caracal'
 - job:
     name: cot_distro-regression_lunar-antelope
     parent: cot-func-target
@@ -105,6 +112,11 @@
     parent: cot-func-target
     vars:
       tox_extra_args: '-- mantic-bobcat'
+- job:
+    name: cot_distro-regression_noble-caracal
+    parent: cot-func-target
+    vars:
+      tox_extra_args: '-- noble-caracal'
 - job:
     name: cot_distro-regression_bionic-queens-security
     parent: cot-func-target
@@ -125,6 +137,11 @@
     parent: cot-func-target
     vars:
       tox_extra_args: '-- lunar-antelope-security'
+- job:
+    name: cot_distro-regression_noble-caracal-security
+    parent: cot-func-target
+    vars:
+      tox_extra_args: '-- noble-caracal-security'
 - job:
     name: cot_distro-regression_focal-ussuri-to-yoga-upgrades
     parent: cot-func-target