Merge ~xavpaice/charm-nrpe:bug/1925278 into charm-nrpe:master

Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: 594e4f790b19bb6f81ec12670720ffa7331f05ba
Merged at revision: a8f58432ce668fcae9a5d30c11d88e696815e43e
Proposed branch: ~xavpaice/charm-nrpe:bug/1925278
Merge into: charm-nrpe:master
Diff against target: 28 lines (+11/-0)
2 files modified
tests/functional/requirements.txt (+1/-0)
tox.ini (+10/-0)
Reviewer Review Type Date Requested Status
Paul Goins Approve
BootStack Reviewers Pending
Review via email: mp+401585@code.launchpad.net

Commit message

Add python-openstackclient to functests

To post a comment you must log in.
Revision history for this message
Paul Goins (vultaire) wrote :

LGTM; +1. Please request one more review for merge.

review: Approve
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 :

Change successfully merged at revision a8f58432ce668fcae9a5d30c11d88e696815e43e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
index b7c9112..bbe8435 100644
--- a/tests/functional/requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1 +1,2 @@
1git+https://github.com/openstack-charmers/zaza.git#egg=zaza1git+https://github.com/openstack-charmers/zaza.git#egg=zaza
2python-openstackclient
diff --git a/tox.ini b/tox.ini
index 4cd3117..840029b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,6 +21,16 @@ passenv =
21 NO_PROXY21 NO_PROXY
22 SNAP_HTTP_PROXY22 SNAP_HTTP_PROXY
23 SNAP_HTTPS_PROXY23 SNAP_HTTPS_PROXY
24 OS_REGION_NAME
25 OS_AUTH_VERSION
26 OS_AUTH_URL
27 OS_PROJECT_DOMAIN_NAME
28 OS_USERNAME
29 OS_PASSWORD
30 OS_PROJECT_ID
31 OS_USER_DOMAIN_NAME
32 OS_PROJECT_NAME
33 OS_IDENTITY_API_VERSION
2434
25[testenv:lint]35[testenv:lint]
26commands =36commands =

Subscribers

People subscribed via source and target branches

to all changes: