Telegraf Charm

Merge ~raychan96/charm-telegraf:update-test-bundle into charm-telegraf:master

  1. Git
  2. lp:~raychan96/charm-telegraf
  3. update-test-bundle
  4. Merge into master
Proposed by Chi Wai CHAN
Status: Merged
Approved by: Eric Chen
Approved revision: 919b67acf8f25dc3a023872f352dbf36739a9f4b
Merged at revision: 7c2ee02170655f939637d5e496f0ac088336a20c
Proposed branch: ~raychan96/charm-telegraf:update-test-bundle
Merge into: charm-telegraf:master
Diff against target: 222 lines (+5/-21)
7 files modified
charmcraft.yaml (+0/-4)
dev/null (+0/-9)
src/tests/functional/requirements.txt (+1/-0)
src/tests/functional/tests/bundles/base-compute.yaml (+3/-0)
src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2 (+1/-1)
src/tests/functional/tests/tests.yaml (+0/-6)
src/tox.ini (+0/-1)
Reviewer Review Type Date Requested Status
JamesLin Approve
Eric Chen Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Review via email: mp+453006@code.launchpad.net

Commit message

Update openstack charms' channel to match the corresponding ubuntu series, and add juju 3.1 support for functional 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
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:c3caec899dadffa2384c201ad798005669270b17
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/20/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1915/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/584/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:c3caec899dadffa2384c201ad798005669270b17
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/21/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/196/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/596/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:c3caec899dadffa2384c201ad798005669270b17
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/22/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/204/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/604/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Tianqi Xiao (txiao) wrote :

Re-triggering CI

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:c3caec899dadffa2384c201ad798005669270b17
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/23/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/227/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/631/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:f6b22ea08c4c117ebf83d6e4c61537754ed357c4
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/24/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/232/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/636/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:f6b22ea08c4c117ebf83d6e4c61537754ed357c4
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/25/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/256/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/659/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:91694dd1c613e8aaf509d6e5664ae3752ddfa2be
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/26/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/278/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/680/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) wrote :

It's weird that we need to create the log in the charm. It was pass in
https://code.launchpad.net/~dashmage/charm-telegraf/+git/charm-telegraf/+merge/446364
I think we do not find the real root cause.

Revision history for this message
Chi Wai CHAN (raychan96) wrote (last edit ):

This was a silence error, and I also could not find out when and how telegraf was changed from the upstream project. However, this is a new bug because both `install_method=deb` and `install_method=snap` reported the same issue in the `journalctl -u telegraf` and `snap logs telegraf` making the config `logfile` practically unusable because it always redirect to stderr, hence `/var/log/telegraf/telegraf.log` does not exists and also `test_04_plugin_errors` failed with "No such file or directory"

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:0192d94d9e7e1055515bac129c714024d511ca80
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/27/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/284/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/686/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) wrote :

wait for 1.28.2 release then we can remove "create_telegraf_logfile" function
https://launchpad.net/~telegraf-devs/+archive/ubuntu/ppa?field.series_filter=focal

review: Needs Fixing
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:919b67acf8f25dc3a023872f352dbf36739a9f4b
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/28/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/298/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/701/

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

review: Approve (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
JamesLin (jneo8) :
review: Approve
Revision history for this message
Chi Wai CHAN (raychan96) wrote :

I've a major change to this MP, please double check if it's okay to you.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 7c2ee02170655f939637d5e496f0ac088336a20c

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charmcraft.yaml b/charmcraft.yaml
2index 559f214..0dcc80d 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -30,7 +30,3 @@ bases:
6 channel: "20.04"
7 architectures:
8 - amd64
9- - name: ubuntu
10- channel: "18.04"
11- architectures:
12- - amd64
13diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
14index e0e4940..a4ec443 100644
15--- a/src/tests/functional/requirements.txt
16+++ b/src/tests/functional/requirements.txt
17@@ -2,3 +2,4 @@
18 # https://github.com/openstack-charmers/zaza/issues/452
19 keystoneauth1
20 python-novaclient
21+git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
22diff --git a/src/tests/functional/tests/bundles/base-compute.yaml b/src/tests/functional/tests/bundles/base-compute.yaml
23index 623d03d..7ab26ac 100644
24--- a/src/tests/functional/tests/bundles/base-compute.yaml
25+++ b/src/tests/functional/tests/bundles/base-compute.yaml
26@@ -22,6 +22,9 @@ machines:
27 applications:
28 telegraf:
29 num_units: 0
30+ options:
31+ install_method: 'deb'
32+ install_sources: 'ppa:telegraf-devs/staging' # Temporary fix for 23.10 release
33 nova-cloud-controller-mysql-router:
34 charm: ch:mysql-router
35 keystone-mysql-router:
36diff --git a/src/tests/functional/tests/bundles/base.yaml b/src/tests/functional/tests/bundles/base.yaml
37deleted file mode 100644
38index d63e529..0000000
39--- a/src/tests/functional/tests/bundles/base.yaml
40+++ /dev/null
41@@ -1,31 +0,0 @@
42-applications:
43- percona-cluster:
44- charm: ch:percona-cluster
45- num_units: 1
46- telegraf:
47- num_units: 0
48- options:
49- prometheus_datasource: prometheus2
50- prometheus_ip_range: '0.0.0.0/0'
51- grafana:
52- charm: ch:grafana
53- num_units: 1
54- options:
55- install_method: snap
56- prometheus2:
57- charm: ch:prometheus2
58- num_units: 1
59-
60-relations:
61- - - percona-cluster:juju-info
62- - telegraf:juju-info
63- - - percona-cluster:db-admin
64- - telegraf:mysql
65- - - prometheus2:target
66- - telegraf:prometheus-client
67- - - grafana:grafana-source
68- - prometheus2:grafana-source
69- - - grafana:dashboards
70- - telegraf:dashboards
71- - - prometheus2:prometheus-rules
72- - telegraf:prometheus-rules
73diff --git a/src/tests/functional/tests/bundles/bionic-compute.yaml b/src/tests/functional/tests/bundles/bionic-compute.yaml
74deleted file mode 120000
75index 1787a74..0000000
76--- a/src/tests/functional/tests/bundles/bionic-compute.yaml
77+++ /dev/null
78@@ -1 +0,0 @@
79-./base-compute.yaml
80\ No newline at end of file
81diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
82deleted file mode 120000
83index 07c6c99..0000000
84--- a/src/tests/functional/tests/bundles/bionic.yaml
85+++ /dev/null
86@@ -1 +0,0 @@
87-./base.yaml
88\ No newline at end of file
89diff --git a/src/tests/functional/tests/bundles/focal.yaml b/src/tests/functional/tests/bundles/focal.yaml
90deleted file mode 120000
91index 07c6c99..0000000
92--- a/src/tests/functional/tests/bundles/focal.yaml
93+++ /dev/null
94@@ -1 +0,0 @@
95-./base.yaml
96\ No newline at end of file
97diff --git a/src/tests/functional/tests/bundles/jammy.yaml b/src/tests/functional/tests/bundles/jammy.yaml
98deleted file mode 120000
99index 07c6c99..0000000
100--- a/src/tests/functional/tests/bundles/jammy.yaml
101+++ /dev/null
102@@ -1 +0,0 @@
103-./base.yaml
104\ No newline at end of file
105diff --git a/src/tests/functional/tests/bundles/overlays/bionic-compute.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-compute.yaml.j2
106deleted file mode 100644
107index ccf0cfc..0000000
108--- a/src/tests/functional/tests/bundles/overlays/bionic-compute.yaml.j2
109+++ /dev/null
110@@ -1,40 +0,0 @@
111-series: bionic
112-
113-machines:
114- '0':
115- series: focal
116- '1':
117- series: focal
118- '2':
119- series: focal
120- '3':
121- '4':
122- series: focal
123- '5':
124- series: focal
125- '6':
126- series: focal
127- '7':
128- '8':
129- '9':
130- series: focal
131-
132-applications:
133- nova-cloud-controller-mysql-router:
134- series: focal
135- keystone-mysql-router:
136- series: focal
137- neutron-api-mysql-router:
138- series: focal
139- placement-mysql-router:
140- series: focal
141- mysql-innodb-cluster:
142- series: focal
143- keystone:
144- series: focal
145- nova-cloud-controller:
146- series: focal
147- neutron-api:
148- series: focal
149- placement:
150- series: focal
151diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
152deleted file mode 100644
153index 65b2826..0000000
154--- a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
155+++ /dev/null
156@@ -1 +0,0 @@
157-series: bionic
158diff --git a/src/tests/functional/tests/bundles/overlays/focal.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
159deleted file mode 100644
160index 5331d30..0000000
161--- a/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
162+++ /dev/null
163@@ -1,5 +0,0 @@
164-series: focal
165-
166-applications:
167- percona-cluster:
168- series: bionic
169diff --git a/src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2
170index 37a3367..441e8de 100644
171--- a/src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2
172+++ b/src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2
173@@ -16,4 +16,4 @@ applications:
174 nova-compute:
175 channel: yoga/stable
176 placement:
177- channel: latest/edge
178+ channel: yoga/stable
179diff --git a/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2
180deleted file mode 100644
181index d1d4c1e..0000000
182--- a/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2
183+++ /dev/null
184@@ -1,9 +0,0 @@
185-series: jammy
186-
187-applications:
188- percona-cluster:
189- series: bionic
190- grafana:
191- series: focal
192- prometheus2:
193- series: focal
194diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
195index caa7b46..ef06d73 100644
196--- a/src/tests/functional/tests/tests.yaml
197+++ b/src/tests/functional/tests/tests.yaml
198@@ -1,14 +1,8 @@
199 charm_name: telegraf
200 gate_bundles:
201- - base: bionic
202- - base: focal
203- - base: jammy
204 - base: focal-snap
205- - compute: bionic-compute
206 - compute: focal-compute
207 - compute: jammy-compute
208-smoke_bundles:
209- - base: focal
210 dev_bundles:
211 - compute: focal-compute
212 target_deploy_status:
213diff --git a/src/tox.ini b/src/tox.ini
214index ff18d44..5cc8d0b 100644
215--- a/src/tox.ini
216+++ b/src/tox.ini
217@@ -81,5 +81,4 @@ deps =
218 changedir = {toxinidir}/tests/functional
219 commands = functest-run-suite {posargs:--keep-faulty-model}
220 deps =
221- git+https://github.com/openstack-charmers/zaza.git#egg=zaza
222 -r {toxinidir}/tests/functional/requirements.txt

Subscribers

People subscribed via source and target branches

to all changes: