Merge ~jneo8/charm-kubernetes-service-checks:build/juju-3.1 into charm-kubernetes-service-checks:master

[JamesLin]

build(juju-3.1): Change zaza dependency to branch libjuju-3.1 and drop func31

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

FAILED: Continuous integration, rev:8c2ca61f876bb9e61f00fec529b211dceb9d1886
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/8/
Executed test runs:
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/590/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/8//rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:8c2ca61f876bb9e61f00fec529b211dceb9d1886
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/203/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/603/

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

review: Needs Fixing (continuous-integration)

[Tianqi Xiao (txiao)]

Re-triggering CI

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

FAILED: Continuous integration, rev:8c2ca61f876bb9e61f00fec529b211dceb9d1886
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/231/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/635/

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

review: Needs Fixing (continuous-integration)

[JamesLin (jneo8)]

Re-build the CI

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

FAILED: Continuous integration, rev:8c2ca61f876bb9e61f00fec529b211dceb9d1886
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/11/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/252/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/655/

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:8c2ca61f876bb9e61f00fec529b211dceb9d1886
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/12/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/270/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/674/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/12//rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:8c2ca61f876bb9e61f00fec529b211dceb9d1886
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/281/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/683/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/13//rebuild

review: Approve (continuous-integration)

[Eric Chen (eric-chen)]

review: Approve

[Tianqi Xiao (txiao)]

LGTM

review: Approve

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

Change successfully merged at revision 59505387af3049d570590a007e13bb43449a0cd2

diff --git a/Makefile b/Makefile
index c4e8f02..a99dd3b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ help:
 	@echo " make proof - run charm proof"
 	@echo " make unittests - run the tests defined in the unittest subdirectory"
 	@echo " make functional - run the tests defined in the functional subdirectory"
-	@echo " make functional31 - run the tests defined in the functional subdirectory with juju 3.1 requirements"
 	@echo " make test - run lint, proof, unittests and functional targets"
 	@echo ""
 
@@ -87,12 +86,8 @@ functional: build
 	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
 	@CHARM_LOCATION=${PROJECTPATH} tox -e func
 
-functional31: build
-	@echo "Executing functional tests in ${CHARM_BUILD_DIR} with juju 3.1 requirements"
-	@CHARM_LOCATION=${PROJECTPATH} tox -e func31
-
 test: lint proof unittests functional
 	@echo "Tests completed for charm ${CHARM_NAME}."
 
 # The targets below don't depend on a file
-.PHONY: help submodules submodules-update clean build release lint black proof unittests functional functional31 test unpack
+.PHONY: help submodules submodules-update clean build release lint black proof unittests functional test unpack
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
index 91424f3..b7d6cae 100644
--- a/tests/functional/requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1 +1,2 @@
 python-openstackclient
+git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
diff --git a/tox.ini b/tox.ini
index 6862feb..2042d4e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -79,11 +79,3 @@ changedir = {toxinidir}/tests/functional
 commands = functest-run-suite --keep-faulty-model {posargs}
 deps =
   -r{toxinidir}/tests/functional/requirements.txt
-  git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-
-[testenv:func31]
-changedir = {toxinidir}/tests/functional
-commands = functest-run-suite --keep-faulty-model {posargs}
-deps =
-  -r{toxinidir}/tests/functional/requirements.txt
-  git+https://github.com/esunar/zaza.git@fix-normalise_action_results#egg=zaza[juju-31]