Backport watcher support to 2023.1

Backport the watcher support to 2023.1. This involves the following: * Update .gitreview file * Update charmcraft.yaml with proper bases * Update osci jobs in osci.yaml * Update src/metadata.yaml to add focal support, fix description * Update src/test-requirements.yaml for 2023.1 zaza branches * Update src/wheelhouse.txt for stable/antelope branches * Update test bundles to use 2023.1 * Add override to specify the common cpu-model Func-Test-Pr: openstack-charmers/zaza-openstack-tests#1175 Change-Id: I81963bae26f6e8f728936da93c364f1c2c7f4a86
openstack · Mar 26, 2024 · 5194e3c · 5194e3c
1 parent 4cb98de
commit 5194e3c
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 62 deletions.
diff --git a/.gitreview b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-watcher.git
+
+defaultbranch=stable/2023.1
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -26,6 +26,3 @@ bases:
       - name: ubuntu
         channel: "23.04"
         architectures: [amd64, arm64, ppc64el, s390x]
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64, arm64, ppc64el, s390x]
diff --git a/osci.yaml b/osci.yaml
@@ -1,9 +1,9 @@
 - project:
     templates:
-      - charm-unit-jobs
+      - charm-unit-jobs-py310
       - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: watcher
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 2.1/stable
diff --git a/src/metadata.yaml b/src/metadata.yaml
@@ -6,13 +6,12 @@ description: |
   OpenStack Watcher provides a flexible and scalable resource
   optimization service for multi-tenant clouds.
   .
-  OpenStack Train or later is required.
+  OpenStack Yoga or later is required.
 tags:
   - openstack
 series:
   - jammy
   - lunar
-  - mantic
 subordinate: false
 requires:
   shared-db:

diff --git a/src/test-requirements.txt b/src/test-requirements.txt
@@ -7,5 +7,5 @@ mock>=1.2
 flake8>=2.2.4,<=2.4.1
 stestr>=2.2.0
 requests>=2.18.4
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/antelope#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/antelope#egg=zaza.openstack
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
@@ -7,42 +7,42 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   gnocchi-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   neutron-api-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   placement-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   watcher-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
-    channel: latest/edge
+    channel: 8.0/edge
     num_units: 3
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
-    channel: latest/edge
+    channel: 3.9/edge
     num_units: 1
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2023.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: 2023.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: 2023.1/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2023.1/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2023.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,31 +106,31 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: 2023.1/edge
 
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.8/edge
 
   ovn-central:
     charm: ch:ovn-central
-    channel: latest/edge
+    channel: 23.03/edge
     num_units: 3
     options:
       source: *openstack-origin
 
   ovn-chassis:
     charm: ch:ovn-chassis
-    channel: latest/edge
+    channel: 23.03/edge
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: 2023.1/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: 2023.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2023.1/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: 2023.1/edge
 
   memcached:
     charm: ch:memcached
@@ -158,15 +158,15 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: quincy/edge
 
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: quincy/edge
 
 relations:
 - - 'keystone:shared-db'

diff --git a/src/tests/bundles/jammy-bobcat.yaml → src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-bobcat.yaml → src/tests/bundles/jammy-zed.yaml
@@ -1,48 +1,48 @@
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
+  openstack-origin: &openstack-origin cloud:jammy-zed
 
 series: &series jammy
 
 applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   gnocchi-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   neutron-api-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   placement-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   watcher-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
-    channel: latest/edge
+    channel: 8.0/edge
     num_units: 3
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
-    channel: latest/edge
+    channel: 3.9/edge
     num_units: 1
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2023.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: 2023.1/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: 2023.1/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2023.1/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2023.1/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,31 +106,31 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: 2023.1/edge
 
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.8/edge
 
   ovn-central:
     charm: ch:ovn-central
-    channel: latest/edge
+    channel: 23.03/edge
     num_units: 3
     options:
       source: *openstack-origin
 
   ovn-chassis:
     charm: ch:ovn-chassis
-    channel: latest/edge
+    channel: 23.03/edge
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: 2023.1/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: 2023.1/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: 2023.1/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: 2023.1/edge
 
   memcached:
     charm: ch:memcached
@@ -158,15 +158,15 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: quincy/edge
 
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: quincy/edge
 
 relations:
 - - 'keystone:shared-db'

diff --git a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -7,6 +7,10 @@ applications:
     charm: ch:hacluster
     num_units: 0
     channel: latest/edge
+  nova-compute:
+    options:
+      cpu-mode: custom
+      cpu-model: SandyBridge
 relations:
 - - watcher
   - hacluster
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
@@ -1,2 +1,2 @@
-git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
-git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+git+https://github.com/juju/charm-helpers.git@stable/antelope#egg=charmhelpers
+git+https://github.com/openstack/charms.openstack.git@stable/antelope#egg=charms.openstack