charm-juju-local

Merge ~mertkirpici/charm-juju-local:topic/juju-3.1 into charm-juju-local:master

  1. Git
  2. lp:~mertkirpici/charm-juju-local
  3. topic/juju-3.1
  4. Merge into master
Proposed by Mert Kirpici
Status: Merged
Approved by: Erhan Sunar
Approved revision: 438a94768bbbcb251e2cf8453cd58da0f497d78a
Merged at revision: 3d15251e721c36877a7b8b8761e97c11b180020f
Proposed branch: ~mertkirpici/charm-juju-local:topic/juju-3.1
Merge into: charm-juju-local:master
Diff against target: 195 lines (+28/-14)
9 files modified
Makefile (+5/-2)
dev/null (+0/-1)
tests/functional/requirements.txt (+0/-3)
tests/functional/tests/bundles/bionic.yaml (+1/-0)
tests/functional/tests/bundles/focal-juju3.yaml (+1/-0)
tests/functional/tests/bundles/focal.yaml (+1/-0)
tests/functional/tests/bundles/jammy-juju3.yaml (+1/-0)
tests/functional/tests/bundles/jammy.yaml (+1/-0)
tox.ini (+18/-8)
Reviewer Review Type Date Requested Status
Erhan Sunar (community) Approve
Andrea Ieri Approve
Eric Chen Needs Information
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Review via email: mp+450788@code.launchpad.net

Commit message

chore: add juju 3.1 support for functests

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:438a94768bbbcb251e2cf8453cd58da0f497d78a
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-local-ci/6/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1739/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/489/

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

review: Approve (continuous-integration)
Revision history for this message
Mert Kirpici (mertkirpici) wrote :

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

Revision history for this message
Andrea Ieri (aieri) wrote :

Generally +1, just one comment in-line.

Revision history for this message
Eric Chen (eric-chen) :
review: Needs Information
Revision history for this message
Mert Kirpici (mertkirpici) :
Revision history for this message
Andrea Ieri (aieri) wrote :

LGTM

review: Approve
Revision history for this message
Erhan Sunar (esunar) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 3d15251e721c36877a7b8b8761e97c11b180020f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Makefile b/Makefile
index ed84e3a..c50103a 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,10 @@ unittests:
23test: lint functional23test: lint functional
2424
25functional: build25functional: build
26 @JUJU_REPOSITORY=$(JUJU_REPOSITORY) tox -e functional26 @JUJU_REPOSITORY=$(JUJU_REPOSITORY) tox -e func
27
28functional31: build
29 @JUJU_REPOSITORY=$(JUJU_REPOSITORY) tox -e func31
2730
28build:31build:
29 @echo "Building charm to base directory $(JUJU_REPOSITORY)"32 @echo "Building charm to base directory $(JUJU_REPOSITORY)"
@@ -40,5 +43,5 @@ clean:
40 @$(RM) $(JUJU_REPOSITORY)/$(CHARM_NAME).charm43 @$(RM) $(JUJU_REPOSITORY)/$(CHARM_NAME).charm
4144
42# The targets below don't depend on a file45# The targets below don't depend on a file
43.PHONY: lint test functional build release clean help46.PHONY: lint test functional functional31 build release clean help
4447
diff --git a/tests/bundles/bionic.yaml b/tests/bundles/bionic.yaml
45deleted file mode 12000048deleted file mode 120000
index f81f6ff..0000000
--- a/tests/bundles/bionic.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/tests/bundles/focal-juju3.yaml b/tests/bundles/focal-juju3.yaml
3deleted file mode 1200001deleted file mode 120000
index f81f6ff..0000000
--- a/tests/bundles/focal-juju3.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/tests/bundles/focal.yaml b/tests/bundles/focal.yaml
3deleted file mode 1200001deleted file mode 120000
index f81f6ff..0000000
--- a/tests/bundles/focal.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/tests/bundles/jammy-juju3.yaml b/tests/bundles/jammy-juju3.yaml
3deleted file mode 1200001deleted file mode 120000
index f81f6ff..0000000
--- a/tests/bundles/jammy-juju3.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/tests/bundles/jammy.yaml b/tests/bundles/jammy.yaml
3deleted file mode 1200001deleted file mode 120000
index f81f6ff..0000000
--- a/tests/bundles/jammy.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/test-requirements.txt b/tests/functional/requirements.txt
3similarity index 66%1similarity index 66%
4rename from test-requirements.txt2rename from test-requirements.txt
5rename to tests/functional/requirements.txt3rename to tests/functional/requirements.txt
index 8ea7c1c..845ceb1 100644
--- a/test-requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1,4 +1 @@
1# zaza
2git+https://github.com/openstack-charmers/zaza.git#egg=zaza
3git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack1git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
4
diff --git a/tests/__init__.py b/tests/functional/tests/__init__.py
5similarity index 100%2similarity index 100%
6rename from tests/__init__.py3rename from tests/__init__.py
7rename to tests/functional/tests/__init__.py4rename to tests/functional/tests/__init__.py
diff --git a/tests/bundles/base.yaml b/tests/functional/tests/bundles/base.yaml
8similarity index 100%5similarity index 100%
9rename from tests/bundles/base.yaml6rename from tests/bundles/base.yaml
10rename to tests/functional/tests/bundles/base.yaml7rename to tests/functional/tests/bundles/base.yaml
diff --git a/tests/functional/tests/bundles/bionic.yaml b/tests/functional/tests/bundles/bionic.yaml
11new file mode 1200008new file mode 120000
index 0000000..f81f6ff
--- /dev/null
+++ b/tests/functional/tests/bundles/bionic.yaml
@@ -0,0 +1 @@
1base.yaml
0\ No newline at end of file2\ No newline at end of file
diff --git a/tests/functional/tests/bundles/focal-juju3.yaml b/tests/functional/tests/bundles/focal-juju3.yaml
1new file mode 1200003new file mode 120000
index 0000000..f81f6ff
--- /dev/null
+++ b/tests/functional/tests/bundles/focal-juju3.yaml
@@ -0,0 +1 @@
1base.yaml
0\ No newline at end of file2\ No newline at end of file
diff --git a/tests/functional/tests/bundles/focal.yaml b/tests/functional/tests/bundles/focal.yaml
1new file mode 1200003new file mode 120000
index 0000000..f81f6ff
--- /dev/null
+++ b/tests/functional/tests/bundles/focal.yaml
@@ -0,0 +1 @@
1base.yaml
0\ No newline at end of file2\ No newline at end of file
diff --git a/tests/functional/tests/bundles/jammy-juju3.yaml b/tests/functional/tests/bundles/jammy-juju3.yaml
1new file mode 1200003new file mode 120000
index 0000000..f81f6ff
--- /dev/null
+++ b/tests/functional/tests/bundles/jammy-juju3.yaml
@@ -0,0 +1 @@
1base.yaml
0\ No newline at end of file2\ No newline at end of file
diff --git a/tests/functional/tests/bundles/jammy.yaml b/tests/functional/tests/bundles/jammy.yaml
1new file mode 1200003new file mode 120000
index 0000000..f81f6ff
--- /dev/null
+++ b/tests/functional/tests/bundles/jammy.yaml
@@ -0,0 +1 @@
1base.yaml
0\ No newline at end of file2\ No newline at end of file
diff --git a/tests/bundles/overlays/bionic.yaml.j2 b/tests/functional/tests/bundles/overlays/bionic.yaml.j2
1similarity index 100%3similarity index 100%
2rename from tests/bundles/overlays/bionic.yaml.j24rename from tests/bundles/overlays/bionic.yaml.j2
3rename to tests/functional/tests/bundles/overlays/bionic.yaml.j25rename to tests/functional/tests/bundles/overlays/bionic.yaml.j2
diff --git a/tests/bundles/overlays/focal-juju3.yaml.j2 b/tests/functional/tests/bundles/overlays/focal-juju3.yaml.j2
4similarity index 100%6similarity index 100%
5rename from tests/bundles/overlays/focal-juju3.yaml.j27rename from tests/bundles/overlays/focal-juju3.yaml.j2
6rename to tests/functional/tests/bundles/overlays/focal-juju3.yaml.j28rename to tests/functional/tests/bundles/overlays/focal-juju3.yaml.j2
diff --git a/tests/bundles/overlays/focal.yaml.j2 b/tests/functional/tests/bundles/overlays/focal.yaml.j2
7similarity index 100%9similarity index 100%
8rename from tests/bundles/overlays/focal.yaml.j210rename from tests/bundles/overlays/focal.yaml.j2
9rename to tests/functional/tests/bundles/overlays/focal.yaml.j211rename to tests/functional/tests/bundles/overlays/focal.yaml.j2
diff --git a/tests/bundles/overlays/jammy-juju3.yaml.j2 b/tests/functional/tests/bundles/overlays/jammy-juju3.yaml.j2
10similarity index 100%12similarity index 100%
11rename from tests/bundles/overlays/jammy-juju3.yaml.j213rename from tests/bundles/overlays/jammy-juju3.yaml.j2
12rename to tests/functional/tests/bundles/overlays/jammy-juju3.yaml.j214rename to tests/functional/tests/bundles/overlays/jammy-juju3.yaml.j2
diff --git a/tests/bundles/overlays/jammy.yaml.j2 b/tests/functional/tests/bundles/overlays/jammy.yaml.j2
13similarity index 100%15similarity index 100%
14rename from tests/bundles/overlays/jammy.yaml.j216rename from tests/bundles/overlays/jammy.yaml.j2
15rename to tests/functional/tests/bundles/overlays/jammy.yaml.j217rename to tests/functional/tests/bundles/overlays/jammy.yaml.j2
diff --git a/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
16similarity index 100%18similarity index 100%
17rename from tests/bundles/overlays/local-charm-overlay.yaml.j219rename from tests/bundles/overlays/local-charm-overlay.yaml.j2
18rename to tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j220rename to tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
diff --git a/tests/tests.yaml b/tests/functional/tests/tests.yaml
19similarity index 100%21similarity index 100%
20rename from tests/tests.yaml22rename from tests/tests.yaml
21rename to tests/functional/tests/tests.yaml23rename to tests/functional/tests/tests.yaml
diff --git a/tests/tests_juju_local.py b/tests/functional/tests/tests_juju_local.py
22similarity index 100%24similarity index 100%
23rename from tests/tests_juju_local.py25rename from tests/tests_juju_local.py
24rename to tests/functional/tests/tests_juju_local.py26rename to tests/functional/tests/tests_juju_local.py
diff --git a/tox.ini b/tox.ini
index 73bddd1..03605df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,17 +5,27 @@ skip_missing_interpreters = True
55
6[testenv]6[testenv]
7basepython = python37basepython = python3
8setenv =
9 PYTHONPATH = .
10
11[testenv:functional]
12commands =
13 functest-run-suite --keep-faulty-model
14deps = -r{toxinidir}/test-requirements.txt
15passenv =8passenv =
16 HOME9 HOME
17 JUJU_REPOSITORY
18 OS_*10 OS_*
11 JUJU_REPOSITORY
12
13setenv =
14 PYTHONPATH = .
15
16[testenv:func]
17changedir = {toxinidir}/tests/functional
18deps =
19 -r {toxinidir}/tests/functional/requirements.txt
20 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
21commands = functest-run-suite --keep-faulty-model {posargs}
22
23[testenv:func31]
24changedir = {toxinidir}/tests/functional
25deps =
26 -r {toxinidir}/tests/functional/requirements.txt
27 git+https://github.com/esunar/zaza.git@fix-normalise_action_results#egg=zaza[juju-31]
28commands = functest-run-suite --keep-faulty-model {posargs}
1929
20[testenv:func-smoke]30[testenv:func-smoke]
21commands =31commands =

Subscribers

People subscribed via source and target branches

to all changes: