memcached-charm

Merge ~jneo8/charm-memcached:build/juju-3.1-support into charm-memcached:master

  1. Git
  2. lp:~jneo8/charm-memcached
  3. build/juju-3.1-support
  4. Merge into master
Proposed by JamesLin
Status: Merged
Approved by: Tianqi Xiao
Approved revision: 0dd301070b487c43df1955ca5fbbe67dd85d358a
Merged at revision: 4119f6d954e70a6b343db41ac9e20f20268f536c
Proposed branch: ~jneo8/charm-memcached:build/juju-3.1-support
Merge into: charm-memcached:master
Diff against target: 163 lines (+11/-41)
7 files modified
charmcraft.yaml (+0/-8)
dev/null (+0/-18)
tests/functional/requirements.txt (+1/-1)
tests/functional/tests/bundles/focal.yaml (+3/-4)
tests/functional/tests/bundles/jammy.yaml (+3/-4)
tests/functional/tests/test_memcached.py (+1/-1)
tests/functional/tests/tests.yaml (+3/-5)
Reviewer Review Type Date Requested Status
Tianqi Xiao (community) Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Eric Chen Approve
Review via email: mp+452746@code.launchpad.net

Commit message

build: Support juju 3.1

- Drop xenial & bionic
- Change zaza branch to libjuju-3.1
- Replace mediawiki with gnocchi in functional test because mediawiki's highest version trusty is not support in juju 3.

Description of the change

## Please don't merge until zaza's patch

Currently the functional test need to wait the fix patch in zaza: https://github.com/openstack-charmers/zaza/pull/617

To post a comment you must log in.
Revision history for this message
JamesLin (jneo8) wrote :

The functional test will pass with zaza's patch.

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 :

FAILED: Continuous integration, rev:b193c3c5ee05f069841c96ec50921dc9aaf0f1f4
https://jenkins.canonical.com/bootstack/job/lp-charm-memcached-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1890/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/554/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:b193c3c5ee05f069841c96ec50921dc9aaf0f1f4
https://jenkins.canonical.com/bootstack/job/lp-charm-memcached-ci/2/
Executed test runs:
    ABORTED: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/139/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/576/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:b193c3c5ee05f069841c96ec50921dc9aaf0f1f4
https://jenkins.canonical.com/bootstack/job/lp-charm-memcached-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/237/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/641/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:b193c3c5ee05f069841c96ec50921dc9aaf0f1f4
https://jenkins.canonical.com/bootstack/job/lp-charm-memcached-ci/4/
Executed test runs:
    None: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/245/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/648/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:b193c3c5ee05f069841c96ec50921dc9aaf0f1f4
https://jenkins.canonical.com/bootstack/job/lp-charm-memcached-ci/5/
Executed test runs:
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/649/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:b533da2d15fcc021caab69d525298ab0358813d5
https://jenkins.canonical.com/bootstack/job/lp-charm-memcached-ci/6/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/247/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/650/

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

review: Approve (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
Tianqi Xiao (txiao) :
review: Needs Fixing
Revision history for this message
JamesLin (jneo8) wrote :

Updated

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

PASSED: Continuous integration, rev:0dd301070b487c43df1955ca5fbbe67dd85d358a
https://jenkins.canonical.com/bootstack/job/lp-charm-memcached-ci/7/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/272/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/676/

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

review: Approve (continuous-integration)
Revision history for this message
Tianqi Xiao (txiao) wrote :

LGTM

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

Change successfully merged at revision 4119f6d954e70a6b343db41ac9e20f20268f536c

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charmcraft.yaml b/charmcraft.yaml
2index 9cd7fe7..2300063 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -27,11 +27,3 @@ bases:
6 channel: "20.04"
7 architectures:
8 - amd64
9- - name: ubuntu
10- channel: "18.04"
11- architectures:
12- - amd64
13- - name: ubuntu
14- channel: "16.04"
15- architectures:
16- - amd64
17diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
18index a05653f..8582577 100644
19--- a/tests/functional/requirements.txt
20+++ b/tests/functional/requirements.txt
21@@ -1,4 +1,4 @@
22-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
23+git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
24 charmhelpers>=0.20.8
25 charms.reactive>=1.3.0
26 python-openstackclient
27diff --git a/tests/functional/tests/bundles/bionic.yaml b/tests/functional/tests/bundles/bionic.yaml
28deleted file mode 100644
29index 21903d5..0000000
30--- a/tests/functional/tests/bundles/bionic.yaml
31+++ /dev/null
32@@ -1,18 +0,0 @@
33-series: bionic
34-
35-applications:
36- mediawiki:
37- charm: mediawiki
38- num_units: 1
39- series: trusty
40- memcached:
41- num_units: 1
42- nrpe:
43- charm: nrpe
44- num_units: 0
45-
46-relations:
47- - - memcached:cache
48- - mediawiki:cache
49- - - memcached:nrpe-external-master
50- - nrpe:nrpe-external-master
51diff --git a/tests/functional/tests/bundles/focal.yaml b/tests/functional/tests/bundles/focal.yaml
52index a53e2d4..54a4d9f 100644
53--- a/tests/functional/tests/bundles/focal.yaml
54+++ b/tests/functional/tests/bundles/focal.yaml
55@@ -1,10 +1,9 @@
56 series: focal
57
58 applications:
59- mediawiki:
60- charm: mediawiki
61+ gnocchi:
62+ charm: gnocchi
63 num_units: 1
64- series: trusty
65 memcached:
66 num_units: 1
67 nrpe:
68@@ -13,6 +12,6 @@ applications:
69
70 relations:
71 - - memcached:cache
72- - mediawiki:cache
73+ - gnocchi:coordinator-memcached
74 - - memcached:nrpe-external-master
75 - nrpe:nrpe-external-master
76diff --git a/tests/functional/tests/bundles/jammy.yaml b/tests/functional/tests/bundles/jammy.yaml
77index 7afd2bd..87221c8 100644
78--- a/tests/functional/tests/bundles/jammy.yaml
79+++ b/tests/functional/tests/bundles/jammy.yaml
80@@ -1,10 +1,9 @@
81 series: jammy
82
83 applications:
84- mediawiki:
85- charm: mediawiki
86+ gnocchi:
87+ charm: gnocchi
88 num_units: 1
89- series: trusty
90 memcached:
91 num_units: 1
92 nrpe:
93@@ -14,6 +13,6 @@ applications:
94
95 relations:
96 - - memcached:cache
97- - mediawiki:cache
98+ - gnocchi:coordinator-memcached
99 - - memcached:nrpe-external-master
100 - nrpe:nrpe-external-master
101diff --git a/tests/functional/tests/bundles/xenial.yaml b/tests/functional/tests/bundles/xenial.yaml
102deleted file mode 100644
103index fc0798d..0000000
104--- a/tests/functional/tests/bundles/xenial.yaml
105+++ /dev/null
106@@ -1,18 +0,0 @@
107-series: xenial
108-
109-applications:
110- mediawiki:
111- charm: cs:mediawiki
112- num_units: 1
113- series: trusty
114- memcached:
115- num_units: 1
116- nrpe:
117- charm: cs:nrpe
118- num_units: 0
119-
120-relations:
121- - - memcached:cache
122- - mediawiki:cache
123- - - memcached:nrpe-external-master
124- - nrpe:nrpe-external-master
125diff --git a/tests/functional/tests/test_memcached.py b/tests/functional/tests/test_memcached.py
126index 7590922..fe3fc6c 100644
127--- a/tests/functional/tests/test_memcached.py
128+++ b/tests/functional/tests/test_memcached.py
129@@ -46,7 +46,7 @@ class BaseMemcachedTest(unittest.TestCase):
130 for unit in cls.units:
131 response = model.run_on_unit(unit.name, cmd)
132 if response["Code"] != "0":
133- cls.fail(
134+ raise Exception(
135 "Could not open port {port} for any source ({unit})".format(
136 port=DEFAULT_PORT, unit=unit.name
137 )
138diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
139index 42b652f..4dcd8a1 100644
140--- a/tests/functional/tests/tests.yaml
141+++ b/tests/functional/tests/tests.yaml
142@@ -2,18 +2,16 @@ charm_name: memcached
143 gate_bundles:
144 - jammy
145 - focal
146- - bionic
147- - xenial
148 smoke_bundles:
149 - focal
150 dev_bundles:
151 - focal
152 target_deploy_status:
153- mediawiki:
154+ gnocchi:
155 workload-status: blocked
156- workload-status-message: Database required
157+ workload-status-message-prefix: "'shared-db' missing, 'identity-service' missing, 'storage-ceph' missing"
158 nrpe:
159 workload-status: blocked
160- workload-status-message: Nagios server not configured or related
161+ workload-status-message-prefix: Nagios server not configured or related
162 tests:
163 - tests.test_memcached.CharmOperationTest

Subscribers

People subscribed via source and target branches

to all changes: