Merge ~troyanov/maas:fix-1982208 into maas:master

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: 3db71b914863459f0ceb328f5d7dbd3f2c6f19c3
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:fix-1982208
Merge into: maas:master
Diff against target: 13 lines (+5/-0)
1 file modified
debian/maas-common.install (+5/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
Alexsander de Souza Approve
Christian Grabowski Approve
Review via email: mp+427380@code.launchpad.net

Commit message

fix: add missing o11y sample configs into deb pkg

Fixes bug #1982208

To post a comment you must log in.
Revision history for this message
Christian Grabowski (cgrabowski) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-1982208 lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/158/consoleText
COMMIT: 7ef77467dd70c2eb45060aac7c8979c9a84035e0

review: Needs Fixing
Revision history for this message
Anton Troyanov (troyanov) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-1982208 lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7ef77467dd70c2eb45060aac7c8979c9a84035e0

review: Approve
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-1982208 lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/163/consoleText
COMMIT: bcfe235244c2d9bc2f87b6de1406ea103574b89b

review: Needs Fixing
Revision history for this message
Anton Troyanov (troyanov) wrote :

jenkins: !test

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/maas-common.install b/debian/maas-common.install
index 9b25546..c9a522e 100644
--- a/debian/maas-common.install
+++ b/debian/maas-common.install
@@ -23,3 +23,8 @@ debian/tmp/usr/share/maas/machine-resources/s390x usr/share/maas/machine-resourc
2323
24usr/bin/maas-common /usr/lib/maas24usr/bin/maas-common /usr/lib/maas
25etc/maas/certificates25etc/maas/certificates
26
27# Install MAAS observability sample configs
28debian/tmp/usr/share/maas/grafana_agent/agent.yaml.example usr/share/maas/grafana_agent
29debian/tmp/usr/share/maas/grafana_agent/env usr/share/maas/grafana_agent
30debian/tmp/usr/share/maas/promtail/promtail.yaml.example usr/share/maas/promtail

Subscribers

People subscribed via source and target branches