Update to OpenStack Yoga

Update OCI images.

Update test bundle and rename to be release agnostic.

Update OSCI channel publish target to yoga/edge.

Change-Id: Ie4a32a52e6924532fce6afae3212e7bd59969d27

charms/cinder-k8s/CONTRIBUTING.md

@@ -47,7 +47,7 @@ run:
 
 To deploy the local test instance:
 
-    juju deploy ./cinder-k8s_ubuntu-20.04-amd64.charm --resource cinder-api-image=kolla/ubuntu-binary-cinder-api:xena --resource cinder-scheduler-image=kolla/ubuntu-binary-cinder-scheduler:xena
+    juju deploy ./cinder-k8s_ubuntu-20.04-amd64.charm --resource cinder-api-image=kolla/ubuntu-binary-cinder-api:yoga --resource cinder-scheduler-image=kolla/ubuntu-binary-cinder-scheduler:yoga
 
 <!-- LINKS -->
 

charms/cinder-k8s/README.md

@@ -49,8 +49,8 @@ cinder-k8s requires the following relations:
 
 The charm by default uses follwoing images:
 
-`docker.io/kolla/ubuntu-binary-cinder-api:xena`
+`docker.io/kolla/ubuntu-binary-cinder-api:yoga`
-`docker.io/kolla/ubuntu-binary-cinder-scheduler:xena`
+`docker.io/kolla/ubuntu-binary-cinder-scheduler:yoga`
 
 ## Contributing
 

charms/cinder-k8s/metadata.yaml

@@ -27,13 +27,13 @@ resources:
   cinder-api-image:
     type: oci-image
     description: OCI image for OpenStack Cinder API
-    # docker.io/kolla/ubuntu-binary-cinder-api:xena
+    # docker.io/kolla/ubuntu-binary-cinder-api:yoga
-    upstream-source: docker.io/kolla/ubuntu-binary-cinder-api@sha256:93999206c297ff25dc2499fa6a146a8424ffe434fffae8cd97ec38aac6721c91
+    upstream-source: docker.io/kolla/ubuntu-binary-cinder-api@sha256:1ea1b20809c6539d012f753ce0ed72d60708698635de11929306682b2d57776c
   cinder-scheduler-image:
     type: oci-image
     description: OCI image for OpenStack Cinder Scheduler
-    # docker.io/kolla/ubuntu-binary-cinder-scheduler:xena
+    # docker.io/kolla/ubuntu-binary-cinder-scheduler:yoga
-    upstream-source: docker.io/kolla/ubuntu-binary-cinder-scheduler@sha256:ea07d1f81e203b08b9cc92f3e569e703bef432f75ec2b4ee0300ef5a14157324
+    upstream-source: docker.io/kolla/ubuntu-binary-cinder-scheduler@sha256:6733bef1cca6c8fb8f6e40f149ae8ad3f5d1bb7d2de6a312b00dca6b1c77af52
 
 requires:
   database:

charms/cinder-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

charms/cinder-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:
@@ -25,13 +25,13 @@ applications:
 
   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,8 +45,8 @@ applications:
     scale: 1
     trust: true
     resources:
-      cinder-api-image: docker.io/kolla/ubuntu-binary-cinder-api:xena
+      cinder-api-image: docker.io/kolla/ubuntu-binary-cinder-api:yoga
-      cinder-scheduler-image: docker.io/kolla/ubuntu-binary-cinder-scheduler:xena
+      cinder-scheduler-image: docker.io/kolla/ubuntu-binary-cinder-scheduler:yoga
 
 relations:
 - - traefik:ingress

charms/cinder-k8s/tests/tests.yaml

@@ -1,7 +1,7 @@
 gate_bundles:
-  - xena
+  - smoke
 smoke_bundles:
-  - xena
+  - smoke
 # There is no storage provider at the moment so cannot run tests.
 configure:
   - zaza.charm_tests.noop.setup.basic_setup
@@ -9,9 +9,9 @@ tests:
   - zaza.charm_tests.noop.tests.NoopTest
 tests_options:
   trust:
-    - xena
+    - smoke
   ignore_hard_deploy_errors:
-    - xena
+    - smoke
 
 target_deploy_status:
   traefik: