Merge ~esunar/charm-prometheus2:added-focal-jammy-tests into charm-prometheus2:master

[Erhan Sunar]

Close LP #1947911
Close LP #1986047

- added functional tests for focal and jammy
- fixed functional tests with vault
- fixed lint errors

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Erhan Sunar (esunar)]

func test logs: https://pastebin.canonical.com/p/TzThJZkJdN/
unit test logs: https://pastebin.canonical.com/p/C4hTH3BdzB/
lint logs: https://pastebin.canonical.com/p/ZsXpqD3P5C/

[Tianqi Xiao (txiao)]

Thanks for the MP. I have some suggestions in this comment and in-line:

- I would be helpful also attaching results from lint and unit tests
- For the link to func test logs, it is not properly redirecting because the plain form is not intended for sharing. Please remove `plain/` at the end of the link.

review: Needs Fixing

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:4b82ce6743ce0bf720ee2283a8925b811219f617
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/35/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/907/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1327/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/35//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:4b82ce6743ce0bf720ee2283a8925b811219f617
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/36/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/908/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1328/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/36//rebuild

review: Needs Fixing (continuous-integration)

[Erhan Sunar (esunar)]

added

> Thanks for the MP. I have some suggestions in this comment and in-line:
>
> - I would be helpful also attaching results from lint and unit tests
> - For the link to func test logs, it is not properly redirecting because the
> plain form is not intended for sharing. Please remove `plain/` at the end of
> the link.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:8c9296a873ecf5c829005bc28b839228a1511255
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/37/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/909/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1329/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/37//rebuild

review: Approve (continuous-integration)

[Tianqi Xiao (txiao)]

Overall looks good, just one small change needed in the test.yaml file. Please see my inline comment below.

[Erhan Sunar (esunar)]

> Overall looks good, just one small change needed in the test.yaml file. Please
> see my inline comment below.

fixed the typo in smoke_bundles in test.yaml

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d440a278e7315bf137bccb6869a01614ccf695e1
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/38/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/925/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1350/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/38//rebuild

review: Needs Fixing (continuous-integration)

[Tianqi Xiao (txiao)]

LGTM

review: Approve

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:d440a278e7315bf137bccb6869a01614ccf695e1
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/39/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/936/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1359/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/39//rebuild

review: Approve (continuous-integration)

[Eric Chen (eric-chen)]

A inline question , thanks!

review: Needs Information

[Chi Wai CHAN (raychan96)]

Not a reviewer, just a comment.

Can you also fix the "[WARNING] DEPRECATION: Application ubuntu uses 'workload-status-message'; please use 'workload-status-message-prefix' instead.". It show up in functional test logs.

[Erhan Sunar (esunar)]

> Not a reviewer, just a comment.
>
> Can you also fix the "[WARNING] DEPRECATION: Application ubuntu uses
> 'workload-status-message'; please use 'workload-status-message-prefix'
> instead.". It show up in functional test logs.

fixed: https://pastebin.canonical.com/p/rqjpJdR2v7/

[Eric Chen (eric-chen)]

We still use bionic for mysql

=====
   mysql:
     charm: percona-cluster
     num_units: 1
+ series: bionic

=======

May I know the reason and I sill suggest to add some note there. It helps the next maintainer to upgrade it at good timing

review: Needs Information

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:f70bd14c0f1349559ba52705e8e8a56ae881fc78
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/45/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/957/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1380/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/45//rebuild

review: Needs Fixing (continuous-integration)

[Erhan Sunar (esunar)]

> We still use bionic for mysql
>
> =====
> mysql:
> charm: percona-cluster
> num_units: 1
> + series: bionic
>
> =======
>
> May I know the reason and I sill suggest to add some note there. It helps the
> next maintainer to upgrade it at good timing

Focal is only supported on the 5.7/edge channel and there is no jammy support. Should I use the edge version?

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:ab82e8a74a3b299b64a0143182bd9c4b3bf038ab
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/46/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/970/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1392/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/46//rebuild

review: Needs Fixing (continuous-integration)

[Eric Chen (eric-chen)]

I am not prefer to use edge channel, because edge channel is not stable. But our CI/CD pipeline needs some level of stability. So keep bionic is okay to me, I just want to know the reason and see if we need to add some comment in the bundle file.

But, I also curious that do we really need "percona-cluster" in our functional test if it doesn't support focal and jammy in the future?

In openstack base bundle, they use mysql-innodb-cluster instead of percona.
https://github.com/openstack-charmers/openstack-bundles/blob/master/stable/openstack-base/bundle.yaml

Please Robert/Martin/Tianqi provide some comment here. Thanks!

review: Needs Information

[Robert Gildein (rgildein)]

I agree that it make much more sense to use `mysql-innodb-cluster`, since
it's more supported. It shouldn't change anything in our tests.

review: Needs Fixing

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d36d552501ad99d338c04e769ce5e9b48472c26c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/51/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1018/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1434/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/51//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d36d552501ad99d338c04e769ce5e9b48472c26c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/52/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1023/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1437/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/52//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d36d552501ad99d338c04e769ce5e9b48472c26c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/53/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1026/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1439/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/53//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d36d552501ad99d338c04e769ce5e9b48472c26c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/54/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1028/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1440/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/54//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d36d552501ad99d338c04e769ce5e9b48472c26c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/55/
Executed test runs:
    ABORTED: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1029/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1441/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/55//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:d36d552501ad99d338c04e769ce5e9b48472c26c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/56/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1030/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1442/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/56//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:d36d552501ad99d338c04e769ce5e9b48472c26c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/57/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1031/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1443/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/57//rebuild

review: Approve (continuous-integration)

[Eric Chen (eric-chen)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 38debb52f8a6089e918b049de796e0046ffa1869

diff --git a/.gitignore b/.gitignore
index 60b19fd..12fa515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,6 @@ dist/
 # Builds
 build/
 *.charm
+
+#vscode history plugin
+.history/**
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 40983f6..84129d5 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -3,17 +3,19 @@ parts:
   charm:
     source: src
     plugin: reactive
-    build-snaps: [charm]
+    build-snaps: 
+      - charm/2.x/stable
 bases:
     - build-on:
         - name: ubuntu
-          channel: "18.04"
-          architectures: ["amd64"]
-        - name: ubuntu
-          channel: "20.04"
+          channel: "22.04"
           architectures: ["amd64"]
       run-on:
         - name: ubuntu
+          channel: "22.04"
+          architectures:
+              - amd64
+        - name: ubuntu
           channel: "20.04"
           architectures:
               - amd64
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 7defc7f..65ce9bb 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -8,9 +8,7 @@ description: |
    condition is observed to be true.
    Due to significant database changes in version 2.0 this charm
    supports prometheus 2.0 and later only.
-series:
-  - bionic
-  - focal
+series: []
 tags:
   - monitoring
 subordinate: false
diff --git a/src/reactive/prometheus.py b/src/reactive/prometheus.py
index acdb0ec..39473af 100644
--- a/src/reactive/prometheus.py
+++ b/src/reactive/prometheus.py
@@ -361,14 +361,12 @@ def get_remote_write_config():
         return None
     try:
         return yaml.dump(
-            yaml.safe_load(config.get("remote-write-config")),
-            default_flow_style=False
+            yaml.safe_load(config.get("remote-write-config")), default_flow_style=False
         )
     except Exception as e:
         hookenv.log(
-            "Failed to parse remote-write-config option, "
-            "Exception: {}".format(e),
-            hookenv.WARNING
+            "Failed to parse remote-write-config option, " "Exception: {}".format(e),
+            hookenv.WARNING,
         )
         return None
 
@@ -410,7 +408,7 @@ def write_prometheus_config_yml():
         hookenv.log(
             "Options 'remote-write' and 'remote-write-config'"
             " are not expected together, 'remote-write' may ignored.",
-            hookenv.WARNING
+            hookenv.WARNING,
         )
         remote_write = None
 
@@ -1019,4 +1017,4 @@ def tls_update():
     set_state("prometheus.do-reload")
 
     # Per layer:tls-client docs, this state needs to be manually removed
-    remove_state("tls_client.client.certs.changed")
\ No newline at end of file
+    remove_state("tls_client.client.certs.changed")
diff --git a/src/tests/functional/tests/bundles/base-vault.yaml b/src/tests/functional/tests/bundles/base-vault.yaml
new file mode 100644
index 0000000..087602f
--- /dev/null
+++ b/src/tests/functional/tests/bundles/base-vault.yaml
@@ -0,0 +1,63 @@
+description: "charm-prometheus2 test bundle"
+applications:
+  prometheus2:
+    num_units: 1
+    options:
+      scrape-interval: 30s
+      scrape-timeout: 20s
+  ubuntu:
+    charm: ch:ubuntu
+    num_units: 1
+  telegraf:
+    charm: ch:telegraf
+    options:
+      prometheus_output_port: default
+  etcd:
+    charm: etcd
+    num_units: 3
+  vault:
+    charm: ch:vault
+    num_units: 1
+    series: focal
+    options:
+      auto-generate-root-ca-cert: true
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0/stable      
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    channel: 8.0/stable
+    num_units: 3
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    series: focal
+    options:
+      admin-password: openstack
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: 8.0/stable      
+relations:
+- - prometheus2:target
+  - telegraf:prometheus-client
+- - telegraf
+  - ubuntu
+
+- - vault:shared-db
+  - vault-mysql-router:shared-db
+- - vault-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router  
+
+- - vault:certificates
+  - keystone:certificates
+- - vault:certificates
+  - etcd:certificates
+- - prometheus2:manual-jobs
+  - etcd:prometheus
+- - vault:certificates
+  - prometheus2:certificates
diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/base.yaml
similarity index 87%
rename from src/tests/functional/tests/bundles/bionic.yaml
rename to src/tests/functional/tests/bundles/base.yaml
index 9f7269b..65b96c0 100644
--- a/src/tests/functional/tests/bundles/bionic.yaml
+++ b/src/tests/functional/tests/bundles/base.yaml
@@ -1,4 +1,3 @@
-series: bionic
 description: "prometheus2-charm test bundle"
 applications:
   prometheus2:
@@ -7,10 +6,10 @@ applications:
       scrape-interval: 30s
       scrape-timeout: 20s
   ubuntu:
-    charm: cs:ubuntu
+    charm: ch:ubuntu
     num_units: 1
   telegraf:
-    charm: cs:telegraf
+    charm: ch:telegraf
     options:
       prometheus_output_port: default
 relations:
diff --git a/src/tests/functional/tests/bundles/bionic-vault.yaml b/src/tests/functional/tests/bundles/bionic-vault.yaml
index 411bce3..e5c6b4f 100644
--- a/src/tests/functional/tests/bundles/bionic-vault.yaml
+++ b/src/tests/functional/tests/bundles/bionic-vault.yaml
@@ -1,4 +1,3 @@
-series: bionic
 description: "charm-prometheus2 test bundle"
 applications:
   prometheus2:
@@ -10,7 +9,7 @@ applications:
     charm: ch:ubuntu
     num_units: 1
   telegraf:
-    charm: cs:telegraf
+    charm: ch:telegraf
     options:
       prometheus_output_port: default
   etcd:
@@ -19,6 +18,7 @@ applications:
   vault:
     charm: ch:vault
     num_units: 1
+    series: focal
     options:
       auto-generate-root-ca-cert: true
   mysql:
@@ -27,6 +27,7 @@ applications:
   keystone:
     charm: ch:keystone
     num_units: 1
+    series: focal
     options:
       admin-password: openstack
 relations:
diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
new file mode 120000
index 0000000..f81f6ff
--- /dev/null
+++ b/src/tests/functional/tests/bundles/bionic.yaml
@@ -0,0 +1 @@
+base.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/focal-vault.yaml b/src/tests/functional/tests/bundles/focal-vault.yaml
new file mode 120000
index 0000000..a7f879a
--- /dev/null
+++ b/src/tests/functional/tests/bundles/focal-vault.yaml
@@ -0,0 +1 @@
+base-vault.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/focal.yaml b/src/tests/functional/tests/bundles/focal.yaml
new file mode 120000
index 0000000..f81f6ff
--- /dev/null
+++ b/src/tests/functional/tests/bundles/focal.yaml
@@ -0,0 +1 @@
+base.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/jammy-vault.yaml b/src/tests/functional/tests/bundles/jammy-vault.yaml
new file mode 120000
index 0000000..a7f879a
--- /dev/null
+++ b/src/tests/functional/tests/bundles/jammy-vault.yaml
@@ -0,0 +1 @@
+base-vault.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/jammy.yaml b/src/tests/functional/tests/bundles/jammy.yaml
new file mode 120000
index 0000000..f81f6ff
--- /dev/null
+++ b/src/tests/functional/tests/bundles/jammy.yaml
@@ -0,0 +1 @@
+base.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
new file mode 100644
index 0000000..04930d7
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
@@ -0,0 +1 @@
+series: bionic
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/focal-vault.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-vault.yaml.j2
new file mode 100644
index 0000000..1bdf16f
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/focal-vault.yaml.j2
@@ -0,0 +1 @@
+series: focal
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/focal.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
new file mode 100644
index 0000000..1bdf16f
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
@@ -0,0 +1 @@
+series: focal
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/jammy-vault.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy-vault.yaml.j2
new file mode 100644
index 0000000..61d74ad
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/jammy-vault.yaml.j2
@@ -0,0 +1 @@
+series: jammy
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2
new file mode 100644
index 0000000..61d74ad
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2
@@ -0,0 +1 @@
+series: jammy
\ No newline at end of file
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index 7d40c7e..17533c6 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -1,25 +1,29 @@
 charm_name: prometheus2
 configure:
-  - model_alias_bionic_vault:
+  - model_alias_vault:
       - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation_no_wait
 tests:
-  - model_alias_bionic_vault:
+  - model_alias_vault:
       - tests.tests_prometheus.TlsPrometheusCharmTest
-  - model_alias_bionic:
+  - model_alias_basic:
       - tests.tests_prometheus.BasicPrometheusCharmTest
 gate_bundles:
-  - model_alias_bionic_vault: bionic-vault
-  - model_alias_bionic: bionic
+  - model_alias_vault: jammy-vault
+  - model_alias_vault: focal-vault
+  - model_alias_vault: bionic-vault    
+  - model_alias_basic: jammy
+  - model_alias_basic: focal
+  - model_alias_basic: bionic
 smoke_bundles:
-  - model_alias_bionic: bionic
+  - model_alias_basic: jammy
 target_deploy_status:
   ubuntu:
-    workload-status-message: ""
+    workload-status-message-prefix: ""
   telegraf:
-    workload-status-message: Monitoring
+    workload-status-message-prefix: Monitoring
   vault:
     workload-status: blocked
-    workload-status-message: Vault needs to be initialized
+    workload-status-message-prefix: Vault needs to be initialized
   etcd:
     workload-status: blocked
-    workload-status-message: Missing relation to certificate authority
+    workload-status-message-prefix: Missing relation to certificate authority
diff --git a/src/tests/functional/tests/tests_prometheus.py b/src/tests/functional/tests/tests_prometheus.py
index 441da34..bb5aa70 100644
--- a/src/tests/functional/tests/tests_prometheus.py
+++ b/src/tests/functional/tests/tests_prometheus.py
@@ -162,6 +162,8 @@ class TlsPrometheusCharmTest(PrometheusCharmTestBase):
         """Test service reload."""
         model.add_unit("ubuntu", wait_appear=True)
         model.block_until_all_units_idle(timeout=600)
+        if len(model.get_units("etcd")) > 0:
+            model.block_until_wl_status_info_starts_with("etcd", "Healthy")
 
         action = model.run_on_unit("ubuntu/1", "hostname -f")
         new_target = action["Stdout"].strip()
diff --git a/src/tests/unit/test_reactive_prometheus.py b/src/tests/unit/test_reactive_prometheus.py
index 606cb6b..e05b35e 100644
--- a/src/tests/unit/test_reactive_prometheus.py
+++ b/src/tests/unit/test_reactive_prometheus.py
@@ -579,20 +579,14 @@ class TestPrometheusContext(unittest.TestCase):
         """Verify updating prometheus remote_write endpoint."""
         remote_write_url = "http://localhost:8086/api/v1/prom/write"
         config = self.def_config
-        config.update(
-            {
-                "remote-write": remote_write_url
-            }
-        )
+        config.update({"remote-write": remote_write_url})
         hookenv.config.return_value = config
         react_prom.update_prometheus_no_targets()
         react_prom.write_prometheus_config_yml()
         react_prom.write_prometheus_config_def()
         react_prom.validate_config.assert_called_once_with()
         yaml_content = yaml.safe_load(open(self.prom_yml))
-        exp_list = [{
-              "url": "http://localhost:8086/api/v1/prom/write"
-            }]
+        exp_list = [{"url": "http://localhost:8086/api/v1/prom/write"}]
         self.assertListEqual(yaml_content["remote_write"], exp_list)
 
     @mock.patch("reactive.prometheus.set_state")
@@ -966,4 +960,4 @@ class TestPrometheusContext(unittest.TestCase):
         bus.set_state("prometheus.installed")
         bus.dispatch()
         host.service_running.assert_called_with("snap.promreg.promreg")
-        host.service_restart.assert_called_with("snap.promreg.promreg")
\ No newline at end of file
+        host.service_restart.assert_called_with("snap.promreg.promreg")