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

Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: 11daf5cec08c7de2e6afb3e4e365fe05910329f7
Merged at revision: bb361c565c979bb946ebbde633feb11af6b1e2a7
Proposed branch: ~xavpaice/charm-graylog:bug/1925278
Merge into: charm-graylog:master
Diff against target: 30 lines (+11/-0)
2 files modified
src/tests/functional/requirements.txt (+1/-0)
src/tox.ini (+10/-0)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Needs Fixing
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+406512@code.launchpad.net

Commit message

Add python-openstackclient for zaza tests

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 :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision bb361c565c979bb946ebbde633feb11af6b1e2a7

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
2index ecf87be..b957193 100644
3--- a/src/tests/functional/requirements.txt
4+++ b/src/tests/functional/requirements.txt
5@@ -2,3 +2,4 @@ tenacity
6 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
7 netifaces
8 charmhelpers
9+python-openstackclient
10diff --git a/src/tox.ini b/src/tox.ini
11index e14fb40..959daf1 100644
12--- a/src/tox.ini
13+++ b/src/tox.ini
14@@ -21,6 +21,16 @@ passenv =
15 NO_PROXY
16 SNAP_HTTP_PROXY
17 SNAP_HTTPS_PROXY
18+ OS_REGION_NAME
19+ OS_AUTH_VERSION
20+ OS_AUTH_URL
21+ OS_PROJECT_DOMAIN_NAME
22+ OS_USERNAME
23+ OS_PASSWORD
24+ OS_PROJECT_ID
25+ OS_USER_DOMAIN_NAME
26+ OS_PROJECT_NAME
27+ OS_IDENTITY_API_VERSION
28
29 [testenv:lint]
30 commands =

Subscribers

People subscribed via source and target branches

to all changes: