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
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 559f214..0dcc80d 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -30,7 +30,3 @@ bases:
30 channel: "20.04"30 channel: "20.04"
31 architectures:31 architectures:
32 - amd6432 - amd64
33 - name: ubuntu
34 channel: "18.04"
35 architectures:
36 - amd64
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
index e0e4940..a4ec443 100644
--- a/src/tests/functional/requirements.txt
+++ b/src/tests/functional/requirements.txt
@@ -2,3 +2,4 @@
2# https://github.com/openstack-charmers/zaza/issues/4522# https://github.com/openstack-charmers/zaza/issues/452
3keystoneauth13keystoneauth1
4python-novaclient4python-novaclient
5git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
diff --git a/src/tests/functional/tests/bundles/base-compute.yaml b/src/tests/functional/tests/bundles/base-compute.yaml
index 623d03d..7ab26ac 100644
--- a/src/tests/functional/tests/bundles/base-compute.yaml
+++ b/src/tests/functional/tests/bundles/base-compute.yaml
@@ -22,6 +22,9 @@ machines:
22applications:22applications:
23 telegraf:23 telegraf:
24 num_units: 024 num_units: 0
25 options:
26 install_method: 'deb'
27 install_sources: 'ppa:telegraf-devs/staging' # Temporary fix for 23.10 release
25 nova-cloud-controller-mysql-router:28 nova-cloud-controller-mysql-router:
26 charm: ch:mysql-router29 charm: ch:mysql-router
27 keystone-mysql-router:30 keystone-mysql-router:
diff --git a/src/tests/functional/tests/bundles/base.yaml b/src/tests/functional/tests/bundles/base.yaml
28deleted file mode 10064431deleted file mode 100644
index d63e529..0000000
--- a/src/tests/functional/tests/bundles/base.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
1applications:
2 percona-cluster:
3 charm: ch:percona-cluster
4 num_units: 1
5 telegraf:
6 num_units: 0
7 options:
8 prometheus_datasource: prometheus2
9 prometheus_ip_range: '0.0.0.0/0'
10 grafana:
11 charm: ch:grafana
12 num_units: 1
13 options:
14 install_method: snap
15 prometheus2:
16 charm: ch:prometheus2
17 num_units: 1
18
19relations:
20 - - percona-cluster:juju-info
21 - telegraf:juju-info
22 - - percona-cluster:db-admin
23 - telegraf:mysql
24 - - prometheus2:target
25 - telegraf:prometheus-client
26 - - grafana:grafana-source
27 - prometheus2:grafana-source
28 - - grafana:dashboards
29 - telegraf:dashboards
30 - - prometheus2:prometheus-rules
31 - telegraf:prometheus-rules
diff --git a/src/tests/functional/tests/bundles/bionic-compute.yaml b/src/tests/functional/tests/bundles/bionic-compute.yaml
32deleted file mode 1200000deleted file mode 120000
index 1787a74..0000000
--- a/src/tests/functional/tests/bundles/bionic-compute.yaml
+++ /dev/null
@@ -1 +0,0 @@
1./base-compute.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
3deleted file mode 1200001deleted file mode 120000
index 07c6c99..0000000
--- a/src/tests/functional/tests/bundles/bionic.yaml
+++ /dev/null
@@ -1 +0,0 @@
1./base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/focal.yaml b/src/tests/functional/tests/bundles/focal.yaml
3deleted file mode 1200001deleted file mode 120000
index 07c6c99..0000000
--- a/src/tests/functional/tests/bundles/focal.yaml
+++ /dev/null
@@ -1 +0,0 @@
1./base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/jammy.yaml b/src/tests/functional/tests/bundles/jammy.yaml
3deleted file mode 1200001deleted file mode 120000
index 07c6c99..0000000
--- a/src/tests/functional/tests/bundles/jammy.yaml
+++ /dev/null
@@ -1 +0,0 @@
1./base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-compute.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-compute.yaml.j2
3deleted file mode 1006441deleted file mode 100644
index ccf0cfc..0000000
--- a/src/tests/functional/tests/bundles/overlays/bionic-compute.yaml.j2
+++ /dev/null
@@ -1,40 +0,0 @@
1series: bionic
2
3machines:
4 '0':
5 series: focal
6 '1':
7 series: focal
8 '2':
9 series: focal
10 '3':
11 '4':
12 series: focal
13 '5':
14 series: focal
15 '6':
16 series: focal
17 '7':
18 '8':
19 '9':
20 series: focal
21
22applications:
23 nova-cloud-controller-mysql-router:
24 series: focal
25 keystone-mysql-router:
26 series: focal
27 neutron-api-mysql-router:
28 series: focal
29 placement-mysql-router:
30 series: focal
31 mysql-innodb-cluster:
32 series: focal
33 keystone:
34 series: focal
35 nova-cloud-controller:
36 series: focal
37 neutron-api:
38 series: focal
39 placement:
40 series: focal
diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
41deleted file mode 1006440deleted file mode 100644
index 65b2826..0000000
--- a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
1series: bionic
diff --git a/src/tests/functional/tests/bundles/overlays/focal.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
2deleted file mode 1006440deleted file mode 100644
index 5331d30..0000000
--- a/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
+++ /dev/null
@@ -1,5 +0,0 @@
1series: focal
2
3applications:
4 percona-cluster:
5 series: bionic
diff --git a/src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2
index 37a3367..441e8de 100644
--- a/src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2
+++ b/src/tests/functional/tests/bundles/overlays/jammy-compute.yaml.j2
@@ -16,4 +16,4 @@ applications:
16 nova-compute:16 nova-compute:
17 channel: yoga/stable17 channel: yoga/stable
18 placement:18 placement:
19 channel: latest/edge19 channel: yoga/stable
diff --git a/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2
20deleted file mode 10064420deleted file mode 100644
index d1d4c1e..0000000
--- a/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2
+++ /dev/null
@@ -1,9 +0,0 @@
1series: jammy
2
3applications:
4 percona-cluster:
5 series: bionic
6 grafana:
7 series: focal
8 prometheus2:
9 series: focal
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index caa7b46..ef06d73 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -1,14 +1,8 @@
1charm_name: telegraf1charm_name: telegraf
2gate_bundles:2gate_bundles:
3 - base: bionic
4 - base: focal
5 - base: jammy
6 - base: focal-snap3 - base: focal-snap
7 - compute: bionic-compute
8 - compute: focal-compute4 - compute: focal-compute
9 - compute: jammy-compute5 - compute: jammy-compute
10smoke_bundles:
11 - base: focal
12dev_bundles:6dev_bundles:
13 - compute: focal-compute7 - compute: focal-compute
14target_deploy_status:8target_deploy_status:
diff --git a/src/tox.ini b/src/tox.ini
index ff18d44..5cc8d0b 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -81,5 +81,4 @@ deps =
81changedir = {toxinidir}/tests/functional81changedir = {toxinidir}/tests/functional
82commands = functest-run-suite {posargs:--keep-faulty-model}82commands = functest-run-suite {posargs:--keep-faulty-model}
83deps =83deps =
84 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
85 -r {toxinidir}/tests/functional/requirements.txt84 -r {toxinidir}/tests/functional/requirements.txt

Subscribers

People subscribed via source and target branches

to all changes: