Skip to content

Commit 4cab5e1

Browse files
authored
Tests: add zaza conf, normalize test bundles (#27)
Signed-off-by: Peter Sabaini <peter.sabaini@canonical.com>
1 parent 1522ad5 commit 4cab5e1

File tree

7 files changed

+20
-8
lines changed

7 files changed

+20
-8
lines changed

ceph-dashboard/tests/bundles/noble-caracal.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ applications:
4848
charm: ch:mysql-router
4949
channel: latest/edge
5050
ceph-dashboard:
51-
charm: ../../../ceph-dashboard.charm
51+
charm: ch:ceph-dashboard
52+
channel: latest/edge
5253
options:
5354
public-hostname: 'ceph-dashboard.zaza.local'
5455
prometheus:

ceph-dashboard/tests/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ configure:
88
- tests.target.setup.check_dashboard_cert
99
- tests.target.setup.set_grafana_url
1010
tests:
11+
- zaza.charm_tests.lifecycle.refresh.CharmRefreshAll
1112
- tests.target.CephDashboardTest
1213
- zaza.openstack.charm_tests.ceph.tests.CephPrometheusTest
1314
target_deploy_status:

ceph-radosgw/tests/bundles/noble-caracal-multisite.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ machines:
1919

2020
applications:
2121
ceph-radosgw:
22-
charm: ../../ceph-radosgw.charm
22+
charm: ch:ceph-radosgw
23+
channel: latest/edge
2324
num_units: 1
2425
options:
2526
source: *source
2627
to:
2728
- '0'
2829

2930
secondary-ceph-radosgw:
30-
charm: ../../ceph-radosgw.charm
31+
charm: ch:ceph-radosgw
32+
channel: latest/edge
3133
num_units: 1
3234
options:
3335
source: *source

ceph-radosgw/tests/bundles/noble-caracal.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ machines:
1919

2020
applications:
2121
ceph-radosgw:
22-
charm: ../../../ceph-radosgw.charm
22+
charm: ch:ceph-radosgw
23+
channel: latest/edge
2324
num_units: 1
2425
options:
2526
source: *source

ceph-radosgw/tests/tests.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
charm_name: ceph-radosgw
22

33
tests:
4-
- tests.target.CephRGWTest
5-
- tests.target.BlueStoreCompressionCharmOperation
6-
- tests.target.CephKeyRotationTests
4+
- zaza.charm_tests.lifecycle.refresh.CharmRefreshAll
5+
- tests.target.CephRGWTest
6+
- tests.target.BlueStoreCompressionCharmOperation
7+
- tests.target.CephKeyRotationTests
78

tests/configs/dot.zaza.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
model_settings:
3+
logging-config: "<root>=INFO;unit=DEBUG"
4+
5+
runtime_config:
6+
TEST_MAX_RESOLVE_COUNT: 5

tests/scripts/actionutils.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function setup_functest() {
3333
localhost localhost
3434
fi
3535
sudo snap install --classic juju-crashdump
36-
36+
cp tests/configs/dot.zaza.yaml ~/.zaza.yaml
3737
}
3838

3939
run="${1}"

0 commit comments

Comments
 (0)