Graylog Charm

Merge ~esunar/charm-graylog:functional-test-fix into charm-graylog:master

  1. Git
  2. lp:~esunar/charm-graylog
  3. functional-test-fix
  4. Merge into master
Proposed by Erhan Sunar
Status: Merged
Approved by: Eric Chen
Approved revision: 63091e8ef905fb212db507166a6b29a1068f4462
Merged at revision: a8019a9c3ab861f99a4d28be8c9b7d34539e35b2
Proposed branch: ~esunar/charm-graylog:functional-test-fix
Merge into: charm-graylog:master
Diff against target: 43 lines (+8/-3)
3 files modified
Makefile (+1/-1)
charmcraft.yaml (+3/-1)
src/reactive/graylog.py (+4/-1)
Reviewer Review Type Date Requested Status
Eric Chen Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+430948@code.launchpad.net

Commit message

Fix functional tests failing in serverstack

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
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:f8e64a86a371cbb438131d94f4023293f954d55e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/177/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1054/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1468/

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

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

FAILED: Continuous integration, rev:f8e64a86a371cbb438131d94f4023293f954d55e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/178/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1055/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1469/

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

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

FAILED: Continuous integration, rev:f8e64a86a371cbb438131d94f4023293f954d55e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/179/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1056/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1470/

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

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

FAILED: Continuous integration, rev:f8e64a86a371cbb438131d94f4023293f954d55e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/180/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1057/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1471/

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

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

FAILED: Continuous integration, rev:f8e64a86a371cbb438131d94f4023293f954d55e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/181/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1058/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1472/

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

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

FAILED: Continuous integration, rev:f8e64a86a371cbb438131d94f4023293f954d55e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/182/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1059/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1473/

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

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

FAILED: Continuous integration, rev:b87788487e5b073e9eb9eeb753d5e876949a3822
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/183/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1061/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1476/

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

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

FAILED: Continuous integration, rev:b87788487e5b073e9eb9eeb753d5e876949a3822
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/184/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1062/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1477/

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

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

FAILED: Continuous integration, rev:63091e8ef905fb212db507166a6b29a1068f4462
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/185/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1063/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1478/

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

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

PASSED: Continuous integration, rev:63091e8ef905fb212db507166a6b29a1068f4462
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/186/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1064/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1479/

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

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

small change , LGTM

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

Change successfully merged at revision a8019a9c3ab861f99a4d28be8c9b7d34539e35b2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index eb7767a..42c8033 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -81,7 +81,7 @@ unittests:
6
7 functional: build
8 @echo "Executing functional tests in ${CHARM_BUILD_DIR}"
9- @cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} CHARM_LOCATION=${PROJECTPATH} tox -e func
10+ @cd src && ZAZA_FEATURE_BUG472=1 CHARM_BUILD_DIR=${CHARM_BUILD_DIR} CHARM_LOCATION=${PROJECTPATH} tox -e func
11
12 functional-extra: build
13 @echo "Executing functional tests in ${CHARM_BUILD_DIR}"
14diff --git a/charmcraft.yaml b/charmcraft.yaml
15index d64e474..9aa96d7 100644
16--- a/charmcraft.yaml
17+++ b/charmcraft.yaml
18@@ -4,7 +4,9 @@ parts:
19 source: src
20 plugin: reactive
21 build-snaps:
22- - charm
23+ # if it is build with charm/3.x it cannot be installed on bionic
24+ # Error: pip requires Python '>=3.7' but the running Python is 3.6.9
25+ - charm/2.x/stable
26 bases:
27 - build-on:
28 - name: ubuntu
29diff --git a/src/reactive/graylog.py b/src/reactive/graylog.py
30index 2fb7469..b6f4313 100644
31--- a/src/reactive/graylog.py
32+++ b/src/reactive/graylog.py
33@@ -1360,7 +1360,10 @@ def tls_request_certificate(tls):
34 set_conf("web_tls_cert_file", CERT_PATH)
35 set_conf("web_tls_key_file", CERT_KEY_PATH)
36
37- set_conf("http_publish_uri", "https://0.0.0.0:{}/".format(get_api_port()))
38+ set_conf(
39+ "http_publish_uri",
40+ validate_api_uri("https://0.0.0.0:{}/".format(get_api_port())),
41+ )
42 set_state("graylog.certificates.configured")
43 remove_state("graylog.initial_certs_received")
44

Subscribers

People subscribed via source and target branches

to all changes: