Merge charm-grafana:bug/1925278 into charm-grafana:master

[Xav Paice]

Add python-openstackclient to functests

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3559c6cb058bf88728ca35dda57c6ff496c9d490
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/2/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/72/

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

review: Needs Fixing (continuous-integration)

[Xav Paice (xavpaice)]

cRT130660 raised for the proxy change to allow the package download that's failing.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3559c6cb058bf88728ca35dda57c6ff496c9d490
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/3/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/73/

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

review: Needs Fixing (continuous-integration)

[Paul Goins (vultaire)]

+1 from me, but please fix the CI failures if you can.

It looks like there was a test for presence of python3-pip which failed.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision f919967fd52bb650361b6ce1bd23ab699fa6e3bb

diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
index b7c9112..bbe8435 100644
--- a/src/tests/functional/requirements.txt
+++ b/src/tests/functional/requirements.txt
@@ -1 +1,2 @@
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+python-openstackclient
diff --git a/src/tox.ini b/src/tox.ini
index 24fb13b..5845e03 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -21,6 +21,16 @@ passenv =
   NO_PROXY
   SNAP_HTTP_PROXY
   SNAP_HTTPS_PROXY
+  OS_REGION_NAME
+  OS_AUTH_VERSION
+  OS_AUTH_URL
+  OS_PROJECT_DOMAIN_NAME
+  OS_USERNAME
+  OS_PASSWORD
+  OS_PROJECT_ID
+  OS_USER_DOMAIN_NAME
+  OS_PROJECT_NAME
+  OS_IDENTITY_API_VERSION
 
 [testenv:lint]
 commands =