Merge ~mertkirpici/charm-kubernetes-service-checks:topic/juju-3.1 into charm-kubernetes-service-checks:master

[Mert Kirpici]

chore: add juju 3.1 compatibility

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

PASSED: Continuous integration, rev:684e3c87f235dc291a1994d0790ee6e4da9d3d5c
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1681/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/468/

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:0f6250bdc3837c1d9bd40da9aeef7128201ad1ea
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/4/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1682/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/469/

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

review: Approve (continuous-integration)

[Robert Gildein (rgildein)]

I'm not sure if this is the best approach because Jenkins won't run `make function31` or not?

[Mert Kirpici (mertkirpici)]

> I'm not sure if this is the best approach because Jenkins won't run `make
> function31` or not?

Hey Robert, part of this work is to get jenkins to run the functional31 target(which is in progress), so technically this also is still a work in progress, waiting for the 3.1 jobs to be implemented first. Sorry for the confustion.

Marking this MR as WIP until the changes on CI are implemented first.

[Robert Gildein (rgildein)]

Why we are not simply defining `make functional` to run `tox -e func` and
`tox -e func31`? There will be no need to do anything on CI and I'm not sure
how we will change the CI, since there is one configuration for all charms.

[Robert Gildein (rgildein)]

> Why we are not simply defining `make functional` to run `tox -e func` and
> `tox -e func31`? There will be no need to do anything on CI and I'm not sure
> how we will change the CI, since there is one configuration for all charms.

I spoke with Erhan about it and I he point out that in Jenkins we are using
same controller for all tests, not like with GitHub actions where we are
bootstrapping new controller before each tests.

This comment should be ignored :).

[Mert Kirpici (mertkirpici)]

Yeah even if we don't end up needing this change, i.e. same zaza version supports both juju controller v2.9 and 3.1, the actual testing on both controllers need to be implemented in jenkins, potentially running both 2.9 and 3.1 jobs in parallel(in different workers) before CI comes clean.

same make target running two separate tox targets would mean the developers need to wait twice as much when they run `make functional` and have multiple juju controllers bootstrapped in their development env.

[Erhan Sunar (esunar)]

review: Approve

[Mert Kirpici (mertkirpici)]

CI run: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest-31/128/console

[Tianqi Xiao (txiao)]

Overall LGTM, just one small suggestion inline

review: Needs Fixing

[Mert Kirpici (mertkirpici)]

update:
 - drop requirements-3.1.txt and use tox for differing requirements
 - updates echo statement in makefile.

will trigger CI and post the result.

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

FAILED: Continuous integration, rev:9463989a11074669272582475617b7f4e397c875
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1731/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/481/

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:9463989a11074669272582475617b7f4e397c875
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/7/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1735/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/485/

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

review: Approve (continuous-integration)

[Mert Kirpici (mertkirpici)]

successful 3.1 CI job: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest-31/171/parameters/

[Tianqi Xiao (txiao)]

LGTM now. Thanks :)

review: Approve

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

Change successfully merged at revision b925e55d4340a47e961116baf01ccb04356bba63

diff --git a/Makefile b/Makefile
index a99dd3b..c4e8f02 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ 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 ""
 
@@ -86,8 +87,12 @@ 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 test unpack
+.PHONY: help submodules submodules-update clean build release lint black proof unittests functional functional31 test unpack
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
index bbe8435..91424f3 100644
--- a/tests/functional/requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1,2 +1 @@
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 python-openstackclient
diff --git a/tox.ini b/tox.ini
index 8599e68..6862feb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -77,4 +77,13 @@ deps = -r{toxinidir}/tests/unit/requirements.txt
 [testenv:func]
 changedir = {toxinidir}/tests/functional
 commands = functest-run-suite --keep-faulty-model {posargs}
-deps = -r{toxinidir}/tests/functional/requirements.txt
+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]