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
1diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
2index b7c9112..bbe8435 100644
3--- a/tests/functional/requirements.txt
4+++ b/tests/functional/requirements.txt
5@@ -1 +1,2 @@
6 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
7+python-openstackclient
8diff --git a/tox.ini b/tox.ini
9index 4cd3117..840029b 100644
10--- a/tox.ini
11+++ b/tox.ini
12@@ -21,6 +21,16 @@ passenv =
13 NO_PROXY
14 SNAP_HTTP_PROXY
15 SNAP_HTTPS_PROXY
16+ OS_REGION_NAME
17+ OS_AUTH_VERSION
18+ OS_AUTH_URL
19+ OS_PROJECT_DOMAIN_NAME
20+ OS_USERNAME
21+ OS_PASSWORD
22+ OS_PROJECT_ID
23+ OS_USER_DOMAIN_NAME
24+ OS_PROJECT_NAME
25+ OS_IDENTITY_API_VERSION
26
27 [testenv:lint]
28 commands =

Subscribers

People subscribed via source and target branches

to all changes: