Graylog Charm

Merge ~vultaire/charm-graylog:gl4-support into charm-graylog:master

  1. Git
  2. lp:~vultaire/charm-graylog
  3. gl4-support
  4. Merge into master
Proposed by Paul Goins
Status: Merged
Approved by: Drew Freiberger
Approved revision: 717bd201cf20ab86959492ca2b0405d90ab3e48d
Merged at revision: 83e2dbf6a9aba961c9824feae3606153a2ae98d1
Proposed branch: ~vultaire/charm-graylog:gl4-support
Merge into: charm-graylog:master
Diff against target: 12 lines (+1/-1)
1 file modified
src/lib/charms/layer/graylog/snap_change.py (+1/-1)
Reviewer Review Type Date Requested Status
Drew Freiberger (community) Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Needs Fixing
BootStack Reviewers Pending
Review via email: mp+413535@code.launchpad.net

Commit message

Allow use of 4/* channels

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

A CI job is currently in progress. A follow up comment will be added when it completes.

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 :

FAILED: Continuous integration, rev:717bd201cf20ab86959492ca2b0405d90ab3e48d
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/80/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/299/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/741/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Drew Freiberger (afreiberger) wrote :

This change needs functional test bundles for graylog 4 to be added before it should be merged.

review: Needs Fixing
Revision history for this message
Drew Freiberger (afreiberger) wrote :

Filed bug to extend functional tests. lp#1956792

basic deployment tested manually, and all functests run locally. Jenkins is mildly broken on the cluster checks.

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

Change successfully merged at revision 83e2dbf6a9aba961c9824feae3606153a2ae98d1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/lib/charms/layer/graylog/snap_change.py b/src/lib/charms/layer/graylog/snap_change.py
2index 59dd792..e0c45c0 100644
3--- a/src/lib/charms/layer/graylog/snap_change.py
4+++ b/src/lib/charms/layer/graylog/snap_change.py
5@@ -80,7 +80,7 @@ def _is_channel_valid(channel):
6 return False
7 # NOTE: While we won't allow changing to the "latest" channel, it is a valid
8 # channel for the snap. We'll reject it elsewhere.
9- snap_tracks = ("2", "3", "latest")
10+ snap_tracks = ("2", "3", "4", "latest")
11 snap_risks = ("stable", "candidate", "beta", "edge")
12 return track in snap_tracks and risk in snap_risks
13

Subscribers

People subscribed via source and target branches

to all changes: