Merge ~hloeung/charm-k8s-content-cache:master into charm-k8s-content-cache:master

Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 7ff877c6ffa2c9eec631e5fc67bee1696063c8a3
Merged at revision: 8b20ba46b62ca53d06cb38ab8906ce29c35e77eb
Proposed branch: ~hloeung/charm-k8s-content-cache:master
Merge into: charm-k8s-content-cache:master
Diff against target: 35 lines (+3/-1)
3 files modified
.gitignore (+1/-0)
.jujuignore (+1/-0)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-is (community) continuous-integration Approve
Paul Collins lgtm Approve
Canonical IS Reviewers Pending
Review via email: mp+403166@code.launchpad.net

Commit message

Generate HTML code coverage report

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) 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
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

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

FAILED: Continuous integration, rev:2ac2e515017a7dd55856ecafb5d0d3b6ddc0562d

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~hloeung/charm-k8s-content-cache/+git/charm-k8s-content-cache/+merge/403166/+edit-commit-message

https://jenkins.canonical.com/is/job/lp-charm-k8s-content-cache-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/102/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/178690/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-content-cache-ci/2//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Paul Collins (pjdc) :
review: Approve (lgtm)
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

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

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

Change successfully merged at revision 8b20ba46b62ca53d06cb38ab8906ce29c35e77eb

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 9759e36..42eb94a 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -5,4 +5,5 @@
6 .coverage
7 .tox/
8 build/
9+htmlcov/
10 __pycache__/
11diff --git a/.jujuignore b/.jujuignore
12index 0ad1790..01c3a63 100644
13--- a/.jujuignore
14+++ b/.jujuignore
15@@ -9,6 +9,7 @@
16 Makefile
17 build/
18 docker/
19+htmlcov/
20 requirements.txt
21 tox.ini
22 tests/
23diff --git a/tox.ini b/tox.ini
24index 2daecb5..64649c7 100644
25--- a/tox.ini
26+++ b/tox.ini
27@@ -11,7 +11,7 @@ setenv =
28 [testenv:unit]
29 commands =
30 pytest \
31- {posargs:-v --cov=src --cov-report=term-missing --cov-branch}
32+ {posargs:-v --cov=src --cov-branch --cov-report=html --cov-report=term-missing}
33 deps = -r{toxinidir}/tests/requirements.txt
34 -r{toxinidir}/requirements.txt
35 setenv =

Subscribers

People subscribed via source and target branches