Backport watcher support to zed release.

Backport the watcher support to zed. This involves the following:

* Update .gitreview file
* Update osci jobs in osci.yaml
* Update src/metadata.yaml to specify jammy/kinetic support, fix
  descriptions
* Update src/test-requirments.yaml for stable/zed zaza branches
* Update test bundles to use zed
* Add override to specify the common cpu-model for migrations

Func-Test-Pr: openstack-charmers/zaza-openstack-tests#1178
Change-Id: Ie9ae372b63d17c7b9087ebd7674fa58e7bc8f634

.gitreview

@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-watcher.git
+
+defaultbranch=stable/zed

charmcraft.yaml

@@ -24,8 +24,5 @@ bases:
         channel: "22.04"
         architectures: [amd64, arm64, ppc64el, s390x]
       - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64, arm64, ppc64el, s390x]
-      - name: ubuntu
-        channel: "23.10"
+        channel: "22.10"
         architectures: [amd64, arm64, ppc64el, s390x]

osci.yaml

@@ -1,9 +1,9 @@
 - project:
     templates:
-      - charm-unit-jobs
-      - charm-functional-jobs
+      - charm-unit-jobs-py310
+      - charm-zed-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: watcher
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 2.0/stable

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
+  - kinetic
 subordinate: false
 requires:
   shared-db:

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/zed#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/zed#egg=zaza.openstack