Merge "Add 2023.2 Bobcat support"

charmcraft.yaml

@@ -28,51 +28,91 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
-        architectures: [amd64]
+        channel: "22.04"
+        architectures: [s390x]
+    run-on:
       - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64]
+        channel: "22.04"
+        architectures: [s390x]
   - build-on:
       - name: ubuntu
         channel: "22.04"
-        architectures: [arm64]
+        architectures: [ppc64el]
     run-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [ppc64el]
+  - build-on:
       - name: ubuntu
         channel: "22.04"
         architectures: [arm64]
+    run-on:
       - name: ubuntu
-        channel: "22.10"
+        channel: "22.04"
         architectures: [arm64]
+  - build-on:
       - name: ubuntu
         channel: "23.04"
-        architectures: [arm64]
+        architectures: [amd64]
+    run-on:
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
+        channel: "23.04"
+        architectures: [s390x]
     run-on:
       - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
+        channel: "23.04"
+        architectures: [s390x]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
+        channel: "23.04"
         architectures: [ppc64el]
+    run-on:
       - name: ubuntu
         channel: "23.04"
         architectures: [ppc64el]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
-        architectures: [s390x]
+        channel: "23.04"
+        architectures: [arm64]
     run-on:
       - name: ubuntu
-        channel: "22.04"
-        architectures: [s390x]
+        channel: "23.04"
+        architectures: [arm64]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
+        channel: "23.10"
         architectures: [s390x]
+    run-on:
       - name: ubuntu
-        channel: "23.04"
+        channel: "23.10"
         architectures: [s390x]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [ppc64el]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [ppc64el]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [arm64]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [arm64]

osci.yaml

@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: designate
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/edge

src/config.yaml

@@ -155,4 +155,4 @@ options:
     description: |
       Set the project ID to own all managed resources like auto-created records etc.
   openstack-origin:
-    default: antelope
+    default: bobcat

src/metadata.yaml

@@ -14,8 +14,8 @@ tags:
 - dns
 series:
 - jammy
-- kinetic
 - lunar
+- mantic
 subordinate: false
 provides:
   dnsaas:

src/tests/bundles/jammy-antelope.yaml

@@ -86,7 +86,7 @@ applications:
     - '7'
 
   designate:
-    charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../designate_ubuntu-22.04-amd64.charm
     num_units: 1
     options:
       nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'

src/tests/bundles/jammy-zed.yaml → src/tests/bundles/jammy-bobcat.yaml

@@ -1,5 +1,5 @@
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-zed
+  openstack-origin: &openstack-origin cloud:jammy-bobcat
 
 local_overlay_enabled: False
 
@@ -86,7 +86,7 @@ applications:
     - '7'
 
   designate:
-    charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../designate_ubuntu-22.04-amd64.charm
     num_units: 1
     options:
       nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'

src/tests/bundles/lunar-antelope.yaml

@@ -86,7 +86,7 @@ applications:
     - '7'
 
   designate:
-    charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../designate_ubuntu-23.04-amd64.charm
     num_units: 1
     options:
       nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'

src/tests/bundles/mantic-bobcat.yaml

@@ -0,0 +1,139 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+local_overlay_enabled: False
+
+series: mantic
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+    series: focal
+  '8':
+
+applications:
+
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  designate-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  neutron-api-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: latest/edge
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+    - '3'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '4'
+    channel: latest/edge
+
+  neutron-api:
+    charm: ch:neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+    channel: latest/edge
+
+  designate-bind:
+    charm: ch:designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+    channel: latest/edge
+
+  memcached:
+    charm: ch:memcached
+    num_units: 1
+    # Note that holding memcached at focal as it's not available at mantic yet.
+    series: focal
+    to:
+    - '7'
+
+  designate:
+    charm: ../../../designate_ubuntu-23.10-amd64.charm
+    num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: *openstack-origin
+    to:
+    - '8'
+
+  nrpe:
+    charm: ch:nrpe
+    channel: latest/edge
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:shared-db'
+    - 'designate-mysql-router:shared-db'
+  - - 'designate-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'designate:dns-backend'
+    - 'designate-bind:dns-backend'
+
+  - - 'designate:coordinator-memcached'
+    - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'

src/tests/tests.yaml

@@ -1,14 +1,15 @@
 charm_name: designate
 
 smoke_bundles:
-  - jammy-zed
+  - jammy-antelope
 
 gate_bundles:
-  - jammy-zed
+  - jammy-antelope
 
 dev_bundles:
-  - jammy-antelope
+  - jammy-bobcat
   - lunar-antelope
+  - mantic-bobcat
 
 tests:
   - zaza.openstack.charm_tests.designate.tests.DesignateTests
@@ -22,6 +23,7 @@ tests_options:
   force_deploy:
     # nrpe charm doesn't support jammy+ and needs to be force installed
     # https://bugs.launchpad.net/charm-nrpe/+bug/1968008
-    - jammy-zed
     - jammy-antelope
+    - jammy-bobcat
     - lunar-antelope
+    - mantic-bobcat