Merge ~dashmage/charm-telegraf:fix-func-tests into charm-telegraf:master

Proposed by Ashley James
Status: Merged
Approved by: Ramesh Sattaru
Approved revision: 479c3429dcf9d076b9488d559be3d72807270136
Merged at revision: 23e4550629a8c759f2fec97aa5c74affc0f3b531
Proposed branch: ~dashmage/charm-telegraf:fix-func-tests
Merge into: charm-telegraf:master
Diff against target: 57 lines (+0/-5)
2 files modified
dev/null (+0/-1)
src/tests/functional/tests/tests.yaml (+0/-4)
Reviewer Review Type Date Requested Status
Ramesh Sattaru (community) Approve
Eric Chen Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Review via email: mp+446364@code.launchpad.net

Commit message

Remove focal-postgres bundle from func-test

Also removes associated base-postgres bundle and entries in tests.yaml
for postgresql.

Description of the change

The functional tests were failing for charm-telegraf. After troubleshooting, it was found that this was due to an issue while running the focal-postgres bundle (which indirectly uses the base-postgres bundle).

After checking with @eric-chen and SolQA team, it was decided that this bundle need not be required in the func test.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
Ramesh Sattaru (rameshcan) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 23e4550629a8c759f2fec97aa5c74affc0f3b531

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/functional/tests/bundles/base-postgres.yaml b/src/tests/functional/tests/bundles/base-postgres.yaml
2deleted file mode 100644
3index c2e52f9..0000000
4--- a/src/tests/functional/tests/bundles/base-postgres.yaml
5+++ /dev/null
6@@ -1,17 +0,0 @@
7-applications:
8- postgresql:
9- charm: ch:postgresql
10- num_units: 2
11- telegraf:
12- num_units: 0
13- ubuntu:
14- charm: ch:ubuntu
15- num_units: 1
16-
17-relations:
18- - - postgresql:juju-info
19- - telegraf:juju-info
20- - - postgresql:db-admin
21- - telegraf:postgresql
22- - - ubuntu:juju-info
23- - telegraf:juju-info
24diff --git a/src/tests/functional/tests/bundles/focal-postgres.yaml b/src/tests/functional/tests/bundles/focal-postgres.yaml
25deleted file mode 120000
26index 56ea9c3..0000000
27--- a/src/tests/functional/tests/bundles/focal-postgres.yaml
28+++ /dev/null
29@@ -1 +0,0 @@
30-./base-postgres.yaml
31\ No newline at end of file
32diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
33index 7bc01f7..caa7b46 100644
34--- a/src/tests/functional/tests/tests.yaml
35+++ b/src/tests/functional/tests/tests.yaml
36@@ -3,21 +3,17 @@ gate_bundles:
37 - base: bionic
38 - base: focal
39 - base: jammy
40- - base: focal-postgres
41 - base: focal-snap
42 - compute: bionic-compute
43 - compute: focal-compute
44 - compute: jammy-compute
45 smoke_bundles:
46- - base: focal-postgres
47 - base: focal
48 dev_bundles:
49 - compute: focal-compute
50 target_deploy_status:
51 telegraf:
52 workload-status-message-prefix: Monitoring
53- postgresql:
54- workload-status-message-prefix: Live
55 grafana:
56 workload-status-message-prefix: Started
57 nova-cloud-controller:

Subscribers

People subscribed via source and target branches

to all changes: