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

[Xav Paice]

add bionic to charmcraft

[🤖 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:9ee579eb2ac9c1898df5086ff7a3b4e42d481260
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/14/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/553/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1016/

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

review: Needs Fixing (continuous-integration)

[🤖 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:ba8cfe3644aade1b58aaca382287e71ed670faf6
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/554/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1017/

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

review: Needs Fixing (continuous-integration)

[🤖 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:d827a427fce42cd21b537e0aa0b3015cf9a77eae
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/16/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/555/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1018/

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

review: Needs Fixing (continuous-integration)

[🤖 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:01e3e148d3c7bc5271701dc468464fce31d9c6c1
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/17/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/559/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1027/

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

review: Needs Fixing (continuous-integration)

[🤖 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:c335c0801f8f22313e90a1877524df6928943bcd
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/18/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/575/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1043/

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

review: Needs Fixing (continuous-integration)

[🤖 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:dc860fb346ffc65738d0dc7ba76d5630af02a989
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/19/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/587/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1055/

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

review: Needs Fixing (continuous-integration)

[🤖 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:1c555ee6ce7e873deed39fd41abaae8ebe6d48b7
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/20/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/593/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1061/

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

review: Needs Fixing (continuous-integration)

[🤖 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:a14959d52a68b5de77b8618a854bcb22e4d8a077
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/21/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/595/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1063/

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

review: Needs Fixing (continuous-integration)

[🤖 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:d8524ddbffd52b32bd6e2d49d44ed273c379e1fd
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/22/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/603/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1071/

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

[🤖 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:2a9f89de064f6cfc4d472b74722d76d8d0bb9ef7
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/24/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/611/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1079/

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

review: Needs Fixing (continuous-integration)

[🤖 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:6423f901c44f84c89eda4f4af122e7164f40ee58
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/25/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/613/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1081/

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

review: Needs Fixing (continuous-integration)

[🤖 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:b3c4ad3b65ad094d0de0e16ff4c73098e9032699
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/26/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/618/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1086/

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

review: Needs Fixing (continuous-integration)

[🤖 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:cfd773026b744613e861e3f2aea0d6705dccb699
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/27/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/623/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1091/

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

review: Needs Fixing (continuous-integration)

[🤖 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:78f06ec96a49be20cbf8ca53ed78940209de0b5c
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/28/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/630/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1098/

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

review: Needs Fixing (continuous-integration)

[🤖 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:b6cd3be0a1b128a696b0db8f29f253adfad3d2b8
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/29/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/651/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1119/

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

review: Needs Fixing (continuous-integration)

[🤖 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:0d775840c7a4e289f2c1b01ae9a7f31f756d99ff
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/30/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/655/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1123/

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

review: Needs Fixing (continuous-integration)

[🤖 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)]

PASSED: Continuous integration, rev:ef201e94957652cb9e736de79a6715474ee05ce3
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/31/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/662/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1130/

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

review: Approve (continuous-integration)

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

Change successfully merged at revision fdbcbe4f1bbe5c85030aab5db2e9f5a6f18edc78

diff --git a/.gitignore b/.gitignore
index b4a8ea3..60b19fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,5 @@ dist/
 *.snap
 
 # Builds
-.build/
\ No newline at end of file
+build/
+*.charm
diff --git a/Makefile b/Makefile
index 0a84b5f..4cb1786 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PYTHON := /usr/bin/python3
 
 PROJECTPATH=$(dir $(realpath $(MAKEFILE_LIST)))
 ifndef CHARM_BUILD_DIR
-	CHARM_BUILD_DIR=${PROJECTPATH}.build
+	CHARM_BUILD_DIR=${PROJECTPATH}/build
 endif
 ifndef CHARM_LAYERS_DIR
 	CHARM_LAYERS_DIR=${PROJECTPATH}/layers
@@ -10,6 +10,9 @@ endif
 ifndef CHARM_INTERFACES_DIR
 	CHARM_INTERFACES_DIR=${PROJECTPATH}/interfaces
 endif
+ifdef CONTAINER
+	BUILD_ARGS="--destructive-mode"
+endif
 METADATA_FILE="src/metadata.yaml"
 CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | grep -E "^name:" | awk '{print $$2}')
 
@@ -35,6 +38,8 @@ clean:
 	@git clean -ffXd -e '!.idea'
 	@echo "Cleaning existing build"
 	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
+	@rm -rf ${PROJECTPATH}/${CHARM_NAME}.charm
+	@charmcraft clean
 
 submodules:
 	# @git submodule update --init --recursive
@@ -44,11 +49,13 @@ submodules-update:
 	# @git submodule update --init --recursive --remote --merge
 	@echo "No submodules. Skipping."
 
-build:
-	@echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
+build: clean
+	@echo "Building charm"
 	@-git rev-parse --abbrev-ref HEAD > ./src/repo-info
-	@CHARM_LAYERS_DIR=${CHARM_LAYERS_DIR} CHARM_INTERFACES_DIR=${CHARM_INTERFACES_DIR} \
-		TERM=linux CHARM_BUILD_DIR=${CHARM_BUILD_DIR} charm build src/
+	@charmcraft -v pack ${BUILD_ARGS}
+	@bash -c ./rename.sh
+	@mkdir -p ${CHARM_BUILD_DIR}/${CHARM_NAME}
+	@unzip ${PROJECTPATH}/${CHARM_NAME}.charm -d ${CHARM_BUILD_DIR}/${CHARM_NAME}
 
 release: clean build
 	@echo "Charm is built at ${CHARM_BUILD_DIR}/${CHARM_NAME}"
@@ -71,7 +78,7 @@ unittests:
 
 functional: build
 	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
-	@cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} tox -e func
+	@cd src && ZAZA_FEATURE_BUG472=1 CHARM_LOCATION=${PROJECTPATH} tox -e func
 
 test: lint proof unittests functional
 	@echo "Tests completed for charm ${CHARM_NAME}."
diff --git a/charmcraft.yaml b/charmcraft.yaml
index f0ffdaa..853f5d7 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -5,9 +5,16 @@ parts:
     plugin: reactive
     build-snaps: [charm]
 bases:
-    - name: ubuntu
-      channel: "20.04"
-      architectures: ["amd64"]
-    - name: ubuntu
-      channel: "18.04"
-      architectures: ["amd64"]
+    - build-on:
+        - name: ubuntu
+          channel: "18.04"
+          architectures: ["amd64"]
+      run-on:
+        - name: ubuntu
+          channel: "20.04"
+          architectures:
+              - amd64
+        - name: ubuntu
+          channel: "18.04"
+          architectures:
+              - amd64
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 0000000..bc8697f
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep -E "^name:" src/metadata.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing previous charm if it exists"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm
diff --git a/src/LICENSE b/src/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/src/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 6431b11..7defc7f 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -1,6 +1,6 @@
 name: prometheus2
 summary: Monitoring system and timeseries database. v2.0 and later only
-maintainer: Llama (LMA) Charmers <[e-mail]> 
+maintainer: Llama (LMA) Charmers <[e-mail]>
 description: |
    Prometheus is a systems and service monitoring system. It collects
    metrics from configured targets at given intervals, evaluates rule
@@ -9,7 +9,6 @@ description: |
    Due to significant database changes in version 2.0 this charm
    supports prometheus 2.0 and later only.
 series:
-  - xenial
   - bionic
   - focal
 tags:
diff --git a/src/reactive/prometheus.py b/src/reactive/prometheus.py
index 3292a4f..4903801 100644
--- a/src/reactive/prometheus.py
+++ b/src/reactive/prometheus.py
@@ -719,13 +719,13 @@ def update_prometheus_scrape_targets(target):
 
 
 @when("endpoint.manual-jobs.has_jobs")
-def update_prometheus_manual_jobs(manual_jobs):
+def update_prometheus_manual_jobs(manual_jobs):  # noqa: C901
     """Configure jobs shipped over relation."""
     job_yamls = []
     certs_dir = Path(PATHS["certs_dir"])
     certs_dir.mkdir(parents=True, exist_ok=True)
     for job in manual_jobs.jobs:
-        if job.keys() >= {"client_cert", "client_key"}:
+        if job.client_cert and job.client_key:
             # The related unit provided the client certificate/key via the
             # manual-jobs relation itself. An optional CA may have been provided.
 
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/tests/functional/tests/bundles/bionic-vault.yaml b/src/tests/functional/tests/bundles/bionic-vault.yaml
index f1b73fb..411bce3 100644
--- a/src/tests/functional/tests/bundles/bionic-vault.yaml
+++ b/src/tests/functional/tests/bundles/bionic-vault.yaml
@@ -7,32 +7,25 @@ applications:
       scrape-interval: 30s
       scrape-timeout: 20s
   ubuntu:
-    charm: cs:ubuntu
+    charm: ch:ubuntu
     num_units: 1
   telegraf:
     charm: cs:telegraf
     options:
       prometheus_output_port: default
   etcd:
-    # charm: cs:~containers/etcd
-    charm: cs:etcd-625
+    charm: etcd
     num_units: 3
-    options:
-      channel: 3.4/stable
-    resources:
-      core: 0
-      etcd: 3
-      snapshot: 0
   vault:
-    charm: cs:vault
+    charm: ch:vault
     num_units: 1
     options:
       auto-generate-root-ca-cert: true
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
diff --git a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
index e78574f..45065bc 100644
--- a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -1,3 +1,3 @@
 applications:
   {{ charm_name }}:
-    charm: "{{ CHARM_BUILD_DIR }}/{{ charm_name }}"
+    charm: "{{ CHARM_LOCATION }}/{{ charm_name }}.charm"
diff --git a/src/tests/functional/tests/bundles/xenial.yaml b/src/tests/functional/tests/bundles/xenial.yaml
deleted file mode 100644
index 3f3b401..0000000
--- a/src/tests/functional/tests/bundles/xenial.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-series: xenial
-description: "prometheus2-charm test bundle"
-applications:
-  prometheus2:
-    num_units: 1
-    options:
-      scrape-interval: 30s
-      scrape-timeout: 20s
-  ubuntu:
-    charm: cs:ubuntu
-    num_units: 1
-  telegraf:
-    charm: cs:telegraf
-    options:
-      prometheus_output_port: default
-relations:
-- - prometheus2:target
-  - telegraf:prometheus-client
-- - telegraf
-  - ubuntu
-
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index 9d5d092..7d40c7e 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -7,12 +7,9 @@ tests:
       - tests.tests_prometheus.TlsPrometheusCharmTest
   - model_alias_bionic:
       - tests.tests_prometheus.BasicPrometheusCharmTest
-  - model_alias_xenial:
-      - tests.tests_prometheus.BasicPrometheusCharmTest
 gate_bundles:
   - model_alias_bionic_vault: bionic-vault
   - model_alias_bionic: bionic
-  - model_alias_xenial: xenial
 smoke_bundles:
   - model_alias_bionic: bionic
 target_deploy_status:
diff --git a/src/tests/functional/tests/tests_prometheus.py b/src/tests/functional/tests/tests_prometheus.py
index 96809b9..441da34 100644
--- a/src/tests/functional/tests/tests_prometheus.py
+++ b/src/tests/functional/tests/tests_prometheus.py
@@ -138,7 +138,8 @@ class TlsPrometheusCharmTest(PrometheusCharmTestBase):
             "prometheus2", "dig +short {}".format(labels["dns_name"])
         )
         label_addr = result["Stdout"].strip()
-        telegraf_addr = model.get_lead_unit_ip("telegraf")
+        telegraf_unit = model.get_unit_from_name("telegraf/0")
+        telegraf_addr = model.get_unit_public_address(telegraf_unit)
         self.assertEqual(label_addr, telegraf_addr)
 
         # Etcd target over TLS
diff --git a/src/tox.ini b/src/tox.ini
index 896410c..5ae440a 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -10,7 +10,10 @@ setenv =
 passenv =
   HOME
   PATH
-  CHARM_BUILD_DIR
+  PROJECTPATH
+  OS_*
+  CHARM_*
+  ZAZA_*
   PYTEST_KEEP_MODEL
   PYTEST_CLOUD_NAME
   PYTEST_CLOUD_REGION