NRPE Charm

Merge ~sudeephb/charm-nrpe:22.10.workaround into charm-nrpe:master

  1. Git
  2. lp:~sudeephb/charm-nrpe
  3. 22.10.workaround
  4. Merge into master
Proposed by Sudeep Bhandari
Status: Merged
Approved by: Eric Chen
Approved revision: 038f8bd7ba2f8a97e7b2143abb5b361963aa90d6
Merged at revision: f82087189f69b58ab86fda7a1144273a10b54187
Proposed branch: ~sudeephb/charm-nrpe:22.10.workaround
Merge into: charm-nrpe:master
Diff against target: 214 lines (+34/-26)
12 files modified
dev/null (+0/-20)
tests/functional/tests/bundles/base.yaml (+10/-5)
tests/functional/tests/bundles/bionic.yaml (+1/-0)
tests/functional/tests/bundles/focal.yaml (+1/-0)
tests/functional/tests/bundles/jammy.yaml (+1/-0)
tests/functional/tests/bundles/overlays/bionic.yaml.j2 (+4/-0)
tests/functional/tests/bundles/overlays/focal.yaml.j2 (+4/-0)
tests/functional/tests/bundles/overlays/jammy.yaml.j2 (+4/-0)
tests/functional/tests/bundles/overlays/xenial.yaml.j2 (+4/-0)
tests/functional/tests/bundles/xenial.yaml (+1/-0)
tests/functional/tests/tests.yaml (+3/-0)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Eric Chen Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+430781@code.launchpad.net

Commit message

Fix functional test bundles

Description of the change

The tests were failing because bionic/xenial ubuntu lxd images were not working properly on bionic/xenial hosts. I added an ubuntu application so we can deploy them on focal host.

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:fd9dbe31e674ec1ca7f2b371c75f4d02b8580284
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/146/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1039/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1451/

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

review: Needs Fixing (continuous-integration)
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 :

PASSED: Continuous integration, rev:038f8bd7ba2f8a97e7b2143abb5b361963aa90d6
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/147/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1040/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1452/

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

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

Change successfully merged at revision f82087189f69b58ab86fda7a1144273a10b54187

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/functional/tests/bundles/jammy.yaml b/tests/functional/tests/bundles/base.yaml
2similarity index 69%
3rename from tests/functional/tests/bundles/jammy.yaml
4rename to tests/functional/tests/bundles/base.yaml
5index 163b381..01fd127 100644
6--- a/tests/functional/tests/bundles/jammy.yaml
7+++ b/tests/functional/tests/bundles/base.yaml
8@@ -1,19 +1,24 @@
9 local_overlay_enabled: true
10-series: jammy
11 applications:
12 rabbitmq-server:
13 charm: ch:rabbitmq-server
14- channel: 3.9/stable
15 num_units: 1
16- constraints: root-disk=8G
17+ # Note(sudeephb): Ubuntu lxd deployments on bionic/xenial hosts are
18+ # not working, issue related to this - https://github.com/lxc/lxd/issues/10231
19+ # (see recent comments/references on the issue). Until the lxd/public-cloud team
20+ # come up with a permanent solution, we can deploy ubuntu bionic and xenial containers
21+ # on focal hosts. After the issue is fixed, the `container` application can be
22+ # deployed on the rabbitmq-server host and this ubuntu host can be removed.
23+ ubuntu:
24+ charm: ch:ubuntu
25+ num_units: 1
26 container:
27 charm: ch:ubuntu
28 num_units: 1
29- to: ["lxd:rabbitmq-server/0"]
30+ to: ["lxd:ubuntu/0"]
31 nagios:
32 charm: ch:nagios
33 num_units: 1
34- series: bionic
35 relations:
36 - - rabbitmq-server:nrpe-external-master
37 - nrpe:nrpe-external-master
38diff --git a/tests/functional/tests/bundles/bionic.yaml b/tests/functional/tests/bundles/bionic.yaml
39new file mode 120000
40index 0000000..f81f6ff
41--- /dev/null
42+++ b/tests/functional/tests/bundles/bionic.yaml
43@@ -0,0 +1 @@
44+base.yaml
45\ No newline at end of file
46diff --git a/tests/functional/tests/bundles/bionic.yaml b/tests/functional/tests/bundles/bionic.yaml
47deleted file mode 100644
48index 119b61f..0000000
49--- a/tests/functional/tests/bundles/bionic.yaml
50+++ /dev/null
51@@ -1,20 +0,0 @@
52-local_overlay_enabled: true
53-series: bionic
54-applications:
55- rabbitmq-server:
56- charm: cs:rabbitmq-server
57- num_units: 1
58- container:
59- charm: cs:ubuntu
60- num_units: 1
61- to: ["lxd:rabbitmq-server/0"]
62- nagios:
63- charm: cs:nagios
64- num_units: 1
65-relations:
66- - - rabbitmq-server:nrpe-external-master
67- - nrpe:nrpe-external-master
68- - - container:juju-info
69- - nrpe:general-info
70- - - nrpe:monitors
71- - nagios:monitors
72diff --git a/tests/functional/tests/bundles/focal.yaml b/tests/functional/tests/bundles/focal.yaml
73new file mode 120000
74index 0000000..f81f6ff
75--- /dev/null
76+++ b/tests/functional/tests/bundles/focal.yaml
77@@ -0,0 +1 @@
78+base.yaml
79\ No newline at end of file
80diff --git a/tests/functional/tests/bundles/focal.yaml b/tests/functional/tests/bundles/focal.yaml
81deleted file mode 100644
82index ba75a6e..0000000
83--- a/tests/functional/tests/bundles/focal.yaml
84+++ /dev/null
85@@ -1,22 +0,0 @@
86-local_overlay_enabled: true
87-series: focal
88-applications:
89- rabbitmq-server:
90- charm: cs:rabbitmq-server
91- num_units: 1
92- constraints: root-disk=8G
93- container:
94- charm: cs:ubuntu
95- num_units: 1
96- to: ["lxd:rabbitmq-server/0"]
97- nagios:
98- charm: cs:nagios
99- num_units: 1
100- series: bionic
101-relations:
102- - - rabbitmq-server:nrpe-external-master
103- - nrpe:nrpe-external-master
104- - - container:juju-info
105- - nrpe:general-info
106- - - nrpe:monitors
107- - nagios:monitors
108diff --git a/tests/functional/tests/bundles/jammy.yaml b/tests/functional/tests/bundles/jammy.yaml
109new file mode 120000
110index 0000000..f81f6ff
111--- /dev/null
112+++ b/tests/functional/tests/bundles/jammy.yaml
113@@ -0,0 +1 @@
114+base.yaml
115\ No newline at end of file
116diff --git a/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/tests/functional/tests/bundles/overlays/bionic.yaml.j2
117new file mode 100644
118index 0000000..7702413
119--- /dev/null
120+++ b/tests/functional/tests/bundles/overlays/bionic.yaml.j2
121@@ -0,0 +1,4 @@
122+series: bionic
123+applications:
124+ ubuntu:
125+ series: focal
126diff --git a/tests/functional/tests/bundles/overlays/focal.yaml.j2 b/tests/functional/tests/bundles/overlays/focal.yaml.j2
127new file mode 100644
128index 0000000..44f4b11
129--- /dev/null
130+++ b/tests/functional/tests/bundles/overlays/focal.yaml.j2
131@@ -0,0 +1,4 @@
132+series: focal
133+applications:
134+ nagios:
135+ series: bionic
136diff --git a/tests/functional/tests/bundles/overlays/jammy.yaml.j2 b/tests/functional/tests/bundles/overlays/jammy.yaml.j2
137new file mode 100644
138index 0000000..a151c85
139--- /dev/null
140+++ b/tests/functional/tests/bundles/overlays/jammy.yaml.j2
141@@ -0,0 +1,4 @@
142+series: jammy
143+applications:
144+ nagios:
145+ series: bionic
146diff --git a/tests/functional/tests/bundles/overlays/xenial.yaml.j2 b/tests/functional/tests/bundles/overlays/xenial.yaml.j2
147new file mode 100644
148index 0000000..56a37e9
149--- /dev/null
150+++ b/tests/functional/tests/bundles/overlays/xenial.yaml.j2
151@@ -0,0 +1,4 @@
152+series: xenial
153+applications:
154+ ubuntu:
155+ series: focal
156diff --git a/tests/functional/tests/bundles/xenial.yaml b/tests/functional/tests/bundles/xenial.yaml
157new file mode 120000
158index 0000000..f81f6ff
159--- /dev/null
160+++ b/tests/functional/tests/bundles/xenial.yaml
161@@ -0,0 +1 @@
162+base.yaml
163\ No newline at end of file
164diff --git a/tests/functional/tests/bundles/xenial.yaml b/tests/functional/tests/bundles/xenial.yaml
165deleted file mode 100644
166index 5e74532..0000000
167--- a/tests/functional/tests/bundles/xenial.yaml
168+++ /dev/null
169@@ -1,20 +0,0 @@
170-local_overlay_enabled: true
171-series: xenial
172-applications:
173- rabbitmq-server:
174- charm: cs:rabbitmq-server
175- num_units: 1
176- container:
177- charm: cs:ubuntu
178- num_units: 1
179- to: ["lxd:rabbitmq-server/0"]
180- nagios:
181- charm: cs:nagios
182- num_units: 1
183-relations:
184- - - rabbitmq-server:nrpe-external-master
185- - nrpe:nrpe-external-master
186- - - container:juju-info
187- - nrpe:general-info
188- - - nrpe:monitors
189- - nagios:monitors
190diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
191index c281785..86fd720 100644
192--- a/tests/functional/tests/tests.yaml
193+++ b/tests/functional/tests/tests.yaml
194@@ -12,6 +12,9 @@ target_deploy_status:
195 container:
196 workload-status: active
197 workload-status-message-prefix: ""
198+ ubuntu:
199+ workload-status: active
200+ workload-status-message-prefix: ""
201 tests_options:
202 force_deploy:
203 - jammy # https://github.com/juju-solutions/charm-ubuntu/issues/44
204diff --git a/tox.ini b/tox.ini
205index 9d593b4..6b76204 100644
206--- a/tox.ini
207+++ b/tox.ini
208@@ -91,5 +91,5 @@ basepython = python3
209 deps = -r{toxinidir}/build-requirements.txt
210 commands =
211 charmcraft clean
212- charmcraft -v build
213+ charmcraft -v pack
214 {toxinidir}/rename.sh

Subscribers

People subscribed via source and target branches

to all changes: