From 24d26b0a181553f6ccef6e4b527b8ad1bf865241 Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Mon, 21 Nov 2022 15:32:30 +0000
Subject: [PATCH] Upgrade charm to OpenStack Yoga

Update OCI image.

Refresh bundles.

Update OSCI publisher.

Make default test/bundle name release agnostic.

Change-Id: I300ff52401eb5ae1969327444f120be6f972a4e0
---
 charms/glance-k8s/metadata.yaml                        |  4 ++--
 charms/glance-k8s/osci.yaml                            |  2 +-
 .../glance-k8s/tests/bundles/{xena.yaml => smoke.yaml} | 10 +++++-----
 charms/glance-k8s/tests/tests.yaml                     |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename charms/glance-k8s/tests/bundles/{xena.yaml => smoke.yaml} (89%)

diff --git a/charms/glance-k8s/metadata.yaml b/charms/glance-k8s/metadata.yaml
index a714cced..d5be698d 100644
--- a/charms/glance-k8s/metadata.yaml
+++ b/charms/glance-k8s/metadata.yaml
@@ -33,8 +33,8 @@ resources:
   glance-api-image:
     type: oci-image
     description: OCI image for OpenStack Glance
-    # docker.io/kolla/ubuntu-binary-glance-api:xena
-    upstream-source: docker.io/kolla/ubuntu-binary-glance-api@sha256:8225f85767f9c712906d51526e749aacb25ed2ec8e93344067e50a15110d2b24
+    # docker.io/kolla/ubuntu-binary-glance-api:yoga
+    upstream-source: docker.io/kolla/ubuntu-binary-glance-api@sha256:c333174a391b915d0b930a131c985d01462e60c5fe6f6f9f9dc7dd4a3f3be3cf
 
 storage:
   local-repository:
diff --git a/charms/glance-k8s/osci.yaml b/charms/glance-k8s/osci.yaml
index d3e1f7c3..deb32f88 100644
--- a/charms/glance-k8s/osci.yaml
+++ b/charms/glance-k8s/osci.yaml
@@ -7,4 +7,4 @@
       build_type: charmcraft
       publish_charm: true
       charmcraft_channel: 2.0/stable
-      publish_channel: xena/edge
+      publish_channel: yoga/edge
diff --git a/charms/glance-k8s/tests/bundles/xena.yaml b/charms/glance-k8s/tests/bundles/smoke.yaml
similarity index 89%
rename from charms/glance-k8s/tests/bundles/xena.yaml
rename to charms/glance-k8s/tests/bundles/smoke.yaml
index 1eb189cc..16c1a261 100644
--- a/charms/glance-k8s/tests/bundles/xena.yaml
+++ b/charms/glance-k8s/tests/bundles/smoke.yaml
@@ -11,13 +11,13 @@ applications:
   # If this isn't present, the units will hang at "installing agent".
   traefik:
     charm: ch:traefik-k8s
-    channel: edge
+    channel: 1.0/stable
     scale: 1
     trust: true
 
   traefik-public:
     charm: ch:traefik-k8s
-    channel: edge
+    channel: 1.0/stable
     scale: 1
     trust: true
     options:
@@ -26,13 +26,13 @@ applications:
   # required for glance
   rabbitmq:
     charm: ch:rabbitmq-k8s
-    channel: edge
+    channel: 3.9/edge
     scale: 1
     trust: true
 
   keystone:
     charm: ch:keystone-k8s
-    channel: edge
+    channel: yoga/edge
     scale: 1
     trust: true
     options:
@@ -45,7 +45,7 @@ applications:
     scale: 1
     trust: true
     resources:
-      glance-api-image: kolla/ubuntu-binary-glance-api:xena
+      glance-api-image: kolla/ubuntu-binary-glance-api:yoga
     storage:
       local-repository: 5G
 
diff --git a/charms/glance-k8s/tests/tests.yaml b/charms/glance-k8s/tests/tests.yaml
index 8996a24f..017bdb97 100644
--- a/charms/glance-k8s/tests/tests.yaml
+++ b/charms/glance-k8s/tests/tests.yaml
@@ -1,7 +1,7 @@
 gate_bundles:
-  - xena
+  - smoke
 smoke_bundles:
-  - xena
+  - smoke
 configure:
   - zaza.openstack.charm_tests.keystone.setup.wait_for_all_endpoints
   - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
@@ -12,9 +12,9 @@ tests:
   - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
 tests_options:
   trust:
-    - xena
+    - smoke
   ignore_hard_deploy_errors:
-    - xena
+    - smoke
 
   tempest:
     default: