Merge ~txiao/charm-juju-controller:func_test into charm-juju-controller:master

Proposed by Tianqi Xiao
Status: Merged
Approved by: Eric Chen
Approved revision: 492fe80ad486b2ff5d513cb90da5e70bff11f43c
Merged at revision: ccac45cdce20da971d0e2aabe8b98b11f6c12e1f
Proposed branch: ~txiao/charm-juju-controller:func_test
Merge into: charm-juju-controller:master
Diff against target: 54 lines (+6/-2)
5 files modified
.gitignore (+1/-0)
src/tests/functional/tests/bundles/base.yaml (+1/-1)
src/tests/functional/tests/bundles/jammy.yaml (+1/-0)
src/tests/functional/tests/bundles/overlays/jammy.yaml.j2 (+1/-0)
src/tests/functional/tests/tests.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Erhan Sunar (community) Approve
Eric Chen Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Needs Fixing
BootStack Reviewers Pending
Review via email: mp+430193@code.launchpad.net

Commit message

Update functional test

- address juju-local's name change
- add jammy test bundle
- include testing-charms/ in .gitignore

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 :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tianqi Xiao (txiao) wrote :

CI is blocked due to this bug: https://bugs.launchpad.net/juju/+bug/1990594

Revision history for this message
Eric Chen (eric-chen) wrote :

LTGM. Why we won't encounter this issue when do testing manually?

review: Needs Information
Revision history for this message
Tianqi Xiao (txiao) wrote :

> LTGM. Why we won't encounter this issue when do testing manually?

After seeing that the CI got blocked, I re-ran the tests locally and observed the same problem. It seems that the issue appeared sometime between my initial test (the one showed in the attached log) and CI.

Revision history for this message
Eric Chen (eric-chen) wrote :

Accorinding to the talking this morning. Function test failed because of the bug in LXD 4.0.
If we already test it and pass, I'm okay to merge it.

review: Approve
Revision history for this message
Erhan Sunar (esunar) wrote :

LGTM

review: Approve
Revision history for this message
Erhan Sunar (esunar) wrote :

LGTM

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

Change successfully merged at revision ccac45cdce20da971d0e2aabe8b98b11f6c12e1f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 7917e99..149351a 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -16,6 +16,7 @@ __pycache__/
6 .tox
7 report/
8 htmlcov/
9+testing-charms/
10
11 # Log files
12 *.log
13diff --git a/src/tests/functional/tests/bundles/base.yaml b/src/tests/functional/tests/bundles/base.yaml
14index bdf6f5b..25cf024 100644
15--- a/src/tests/functional/tests/bundles/base.yaml
16+++ b/src/tests/functional/tests/bundles/base.yaml
17@@ -8,6 +8,6 @@ applications:
18 to:
19 - '0'
20 juju-local:
21- charm: "cs:~bootstack-charmers-next/juju-local"
22+ charm: "ch:bootstack-charmers-juju-local"
23 relations:
24 - ["ubuntu", "juju-local"]
25diff --git a/src/tests/functional/tests/bundles/jammy.yaml b/src/tests/functional/tests/bundles/jammy.yaml
26new file mode 120000
27index 0000000..f81f6ff
28--- /dev/null
29+++ b/src/tests/functional/tests/bundles/jammy.yaml
30@@ -0,0 +1 @@
31+base.yaml
32\ No newline at end of file
33diff --git a/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2 b/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2
34new file mode 100644
35index 0000000..bc860fa
36--- /dev/null
37+++ b/src/tests/functional/tests/bundles/overlays/jammy.yaml.j2
38@@ -0,0 +1 @@
39+series: jammy
40diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
41index 5f7d9e0..8964ea6 100644
42--- a/src/tests/functional/tests/tests.yaml
43+++ b/src/tests/functional/tests/tests.yaml
44@@ -5,8 +5,9 @@ tests:
45 gate_bundles:
46 - model_alias_bionic: bionic
47 - model_alias_bionic: focal
48+ - model_alias_bionic: jammy
49 smoke_bundles:
50- - model_alias_bionic: bionic
51+ - model_alias_bionic: jammy
52 target_deploy_status:
53 juju-local:
54 workload-status: active

Subscribers

People subscribed via source and target branches

to all changes: