Merge ~xavpaice/charm-prometheus2:lp1947913 into charm-prometheus2:master

[Xav Paice]

Update snap resources for core20

The prometheus snap no longer uses the 'core' snap, but 'core20'. Update the resources defined, and snap installation, to reflect that change.

Closes-bug: LP: #1947913

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

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

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

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

[Andrea Ieri (aieri)]

lgtm

review: Approve

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

FAILED: Continuous integration, rev:ac867f98def685945ce236fe382426b80fe1804c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/171/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/602/

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

review: Needs Fixing (continuous-integration)

8f75b70... by Xav Paice on 2021-10-21

Add python-openstackclient for zaza tests

Closes-bug: LP: #1925278

[🤖 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:8f75b70cc97585d0e2ba2f1d0b6b16cd47b8e968
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/172/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/605/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:8f75b70cc97585d0e2ba2f1d0b6b16cd47b8e968
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/11/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/173/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/609/

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

review: Needs Fixing (continuous-integration)

Unmerged commits

8f75b70... by Xav Paice on 2021-10-21

Add python-openstackclient for zaza tests

Closes-bug: LP: #1925278

ac867f9... by Xav Paice on 2021-10-20

Update snap resources for core20

The prometheus snap no longer uses the 'core' snap, but 'core20'.
Update the resources defined, and snap installation, to reflect that
change.

Closes-bug: LP: #1947913

diff --git a/src/metadata.yaml b/src/metadata.yaml
index 6431b11..1f27222 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -39,10 +39,10 @@ requires:
   prometheus-rules:
     interface: prometheus-rules
 resources:
-  core:
+  core20:
     type: file
-    filename: core.snap
-    description: Snap package of core
+    filename: core20.snap
+    description: Snap package of core20
   prometheus:
     type: file
     filename: prometheus.snap
diff --git a/src/reactive/prometheus.py b/src/reactive/prometheus.py
index 888f7b4..0276ab8 100644
--- a/src/reactive/prometheus.py
+++ b/src/reactive/prometheus.py
@@ -274,7 +274,7 @@ def install_packages():
 
     if not os.path.exists("/usr/sbin/sendmail"):
         fetch.apt_install("sendmail-bin")  # Needed for cronjob email notifications
-    snap.install("core")  # Needed for offline deploy; falls back to store as needed
+    snap.install("core20")  # Needed for offline deploy; falls back to store as needed
     snap.install(pkgname, channel=channel, force_dangerous=False)
     if config.get("prometheus_registration_listen", False):
         channel = config.get("promreg_snap_channel", "stable")
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
index a386607..e928204 100644
--- a/src/tests/functional/requirements.txt
+++ b/src/tests/functional/requirements.txt
@@ -1,3 +1,4 @@
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
 pyyaml
+python-openstackclient
diff --git a/src/tox.ini b/src/tox.ini
index 4214c14..ac7c75e 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 =