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
diff --git a/src/tests/functional/tests/bundles/base-postgres.yaml b/src/tests/functional/tests/bundles/base-postgres.yaml
0deleted file mode 1006440deleted file mode 100644
index c2e52f9..0000000
--- a/src/tests/functional/tests/bundles/base-postgres.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
1applications:
2 postgresql:
3 charm: ch:postgresql
4 num_units: 2
5 telegraf:
6 num_units: 0
7 ubuntu:
8 charm: ch:ubuntu
9 num_units: 1
10
11relations:
12 - - postgresql:juju-info
13 - telegraf:juju-info
14 - - postgresql:db-admin
15 - telegraf:postgresql
16 - - ubuntu:juju-info
17 - telegraf:juju-info
diff --git a/src/tests/functional/tests/bundles/focal-postgres.yaml b/src/tests/functional/tests/bundles/focal-postgres.yaml
18deleted file mode 1200000deleted file mode 120000
index 56ea9c3..0000000
--- a/src/tests/functional/tests/bundles/focal-postgres.yaml
+++ /dev/null
@@ -1 +0,0 @@
1./base-postgres.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index 7bc01f7..caa7b46 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -3,21 +3,17 @@ gate_bundles:
3 - base: bionic3 - base: bionic
4 - base: focal4 - base: focal
5 - base: jammy5 - base: jammy
6 - base: focal-postgres
7 - base: focal-snap6 - base: focal-snap
8 - compute: bionic-compute7 - compute: bionic-compute
9 - compute: focal-compute8 - compute: focal-compute
10 - compute: jammy-compute9 - compute: jammy-compute
11smoke_bundles:10smoke_bundles:
12 - base: focal-postgres
13 - base: focal11 - base: focal
14dev_bundles:12dev_bundles:
15 - compute: focal-compute13 - compute: focal-compute
16target_deploy_status:14target_deploy_status:
17 telegraf:15 telegraf:
18 workload-status-message-prefix: Monitoring16 workload-status-message-prefix: Monitoring
19 postgresql:
20 workload-status-message-prefix: Live
21 grafana:17 grafana:
22 workload-status-message-prefix: Started18 workload-status-message-prefix: Started
23 nova-cloud-controller:19 nova-cloud-controller:

Subscribers

People subscribed via source and target branches

to all changes: