From cac4c53a9071142e340993aa535aed733198f719 Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <hemanth.nakkina@canonical.com>
Date: Wed, 23 Aug 2023 09:55:24 +0530
Subject: [PATCH] Add zuul yaml

Add zuul yaml to trigger zuul jobs
Update tests.yaml to wait for application to
be in desired state
Permit charm to run on juju 3.1

Change-Id: Id0191088a9ea447d7915f6f695c136bf06e9c154
---
 charms/aodh-k8s/.zuul.yaml               | 11 +++++++++
 charms/aodh-k8s/metadata.yaml            |  2 +-
 charms/aodh-k8s/tests/bundles/smoke.yaml |  9 +++----
 charms/aodh-k8s/tests/tests.yaml         | 31 +++++++++++++++++++++---
 4 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100644 charms/aodh-k8s/.zuul.yaml

diff --git a/charms/aodh-k8s/.zuul.yaml b/charms/aodh-k8s/.zuul.yaml
new file mode 100644
index 00000000..4e1989b2
--- /dev/null
+++ b/charms/aodh-k8s/.zuul.yaml
@@ -0,0 +1,11 @@
+- project:
+    templates:
+      - openstack-python3-charm-jobs
+      - openstack-cover-jobs
+      - microk8s-func-test
+    vars:
+      charm_build_name: aodh-k8s
+      juju_channel: 3.1/stable
+      juju_classic_mode: false
+      microk8s_channel: 1.26-strict/stable
+      microk8s_classic_mode: false
diff --git a/charms/aodh-k8s/metadata.yaml b/charms/aodh-k8s/metadata.yaml
index 5b3aef36..10410998 100644
--- a/charms/aodh-k8s/metadata.yaml
+++ b/charms/aodh-k8s/metadata.yaml
@@ -12,7 +12,7 @@ bases:
     channel: 22.04/stable
 assumes:
   - k8s-api
-  - juju >= 3.2
+  - juju >= 3.1
 tags:
 - openstack
 source: https://opendev.org/openstack/charm-aodh-k8s
diff --git a/charms/aodh-k8s/tests/bundles/smoke.yaml b/charms/aodh-k8s/tests/bundles/smoke.yaml
index 4d3341a3..5a114a16 100644
--- a/charms/aodh-k8s/tests/bundles/smoke.yaml
+++ b/charms/aodh-k8s/tests/bundles/smoke.yaml
@@ -41,13 +41,13 @@ applications:
       fernet-keys: 5M
       credential-keys: 5M
   gnocchi:
-    charm: gnocchi-k8s
-    channel: edge
+    charm: ch:gnocchi-k8s
+    channel: 2023.1/edge
     scale: 1
     trust: true
   ceilometer:
-    charm: ceilometer-k8s
-    channel: edge
+    charm: ch:ceilometer-k8s
+    channel: 2023.1/edge
     scale: 1
     trust: true
   aodh:
@@ -94,4 +94,3 @@ relations:
   - ceilometer:amqp
 - - keystone:identity-credentials
   - ceilometer:identity-credentials
-
diff --git a/charms/aodh-k8s/tests/tests.yaml b/charms/aodh-k8s/tests/tests.yaml
index 34e47f18..c5587f17 100644
--- a/charms/aodh-k8s/tests/tests.yaml
+++ b/charms/aodh-k8s/tests/tests.yaml
@@ -3,8 +3,9 @@ gate_bundles:
 smoke_bundles:
   - smoke
 configure:
-  - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
-tests: []
+  - zaza.charm_tests.noop.setup.basic_setup
+tests:
+  - zaza.charm_tests.noop.tests.NoopTest
 tests_options:
   trust:
     - smoke
@@ -15,4 +16,28 @@ tests_options:
     default:
       smoke: True
 
-target_deploy_status: []
+target_deploy_status:
+  traefik:
+    workload-status: active
+    workload-status-message-regex: '^$'
+  traefik-public:
+    workload-status: active
+    workload-status-message-regex: '^$'
+  keystone:
+    workload-status: active
+    workload-status-message-regex: '^$'
+  mysql:
+    workload-status: active
+    workload-status-message-regex: '^.*$'
+  rabbitmq:
+    workload-status: active
+    workload-status-message-regex: '^.*$'
+  ceilometer:
+    workload-status: active
+    workload-status-message-regex: '^.*$'
+  aodh:
+    workload-status: active
+    workload-status-message-regex: '^.*$'
+  gnocchi:
+    workload-status: blocked
+    workload-status-message-regex: '^.*ceph.*$'