memcached-charm

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

  1. Git
  2. lp:~jneo8/charm-memcached
  3. build/jammy-support
  4. Merge into master
Proposed by JamesLin
Status: Merged
Approved by: Eric Chen
Approved revision: 828a397d12ba96eddeeaedc059861bce5d1e0470
Merged at revision: f6d51ec7bd18e1206132ae1fed589e907e71b08f
Proposed branch: ~jneo8/charm-memcached:build/jammy-support
Merge into: charm-memcached:master
Diff against target: 226 lines (+35/-40)
12 files modified
Makefile (+1/-1)
charmcraft.yaml (+4/-1)
dev/null (+0/-20)
hooks/charmhelpers/core/host_factory/ubuntu.py (+2/-1)
metadata.yaml (+1/-7)
tests/functional/requirements.txt (+2/-0)
tests/functional/tests/bundles/bionic.yaml (+2/-2)
tests/functional/tests/bundles/focal.yaml (+2/-2)
tests/functional/tests/bundles/jammy.yaml (+4/-3)
tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 (+1/-1)
tests/functional/tests/tests.yaml (+1/-2)
tox.ini (+15/-0)
Reviewer Review Type Date Requested Status
Eric Chen Approve
Martin Kalcok (community) Needs Fixing
BootStack Reviewers Pending
Review via email: mp+428612@code.launchpad.net

Commit message

Jammy support

* Remove trusty support
* Update build files(metadata.yaml, charmcraft.yaml) to support jammy
* Add jammy bundle & fix functional test

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
Mert Kirpici (mertkirpici) wrote :

I left a couple non-blocking suggestions.

Revision history for this message
Martin Kalcok (martin-kalcok) wrote :

I have one in-line question and could you please update all the test bundle to stop using "cs:"? Thanks, otherwise LGTM.

review: Needs Fixing
Revision history for this message
Eric Chen (eric-chen) :
review: Needs Information
Revision history for this message
JamesLin (jneo8) wrote :

> I have one in-line question and could you please update all the test bundle to
> stop using "cs:"? Thanks, otherwise LGTM.

Sure

Revision history for this message
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
Eric Chen (eric-chen) :
review: Needs Information
Revision history for this message
Eric Chen (eric-chen) wrote :

Please attach the log of unit/func test. thanks

review: Needs Information
Revision history for this message
JamesLin (jneo8) :
Revision history for this message
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision f6d51ec7bd18e1206132ae1fed589e907e71b08f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index a0cb31a..bbb96ed 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -73,7 +73,7 @@ unittests: submodules-update
6
7 functional: build
8 @echo "Executing functional tests in ${CHARM_BUILD_DIR}"
9- @CHARM_BUILD_DIR=${CHARM_BUILD_DIR} tox -e func
10+ CHARM_PROJECTPATH=${PROJECTPATH} tox -e func
11
12 test: lint proof unittests functional
13 @echo "Charm ${CHARM_NAME} has been tested"
14diff --git a/charmcraft.yaml b/charmcraft.yaml
15index 6189926..9cd7fe7 100644
16--- a/charmcraft.yaml
17+++ b/charmcraft.yaml
18@@ -17,10 +17,13 @@ parts:
19 bases:
20 - build-on:
21 - name: ubuntu
22- channel: "20.04"
23+ channel: "22.04"
24 architectures: ["amd64"]
25 run-on:
26 - name: ubuntu
27+ channel: "22.04"
28+ architectures: ["amd64"]
29+ - name: ubuntu
30 channel: "20.04"
31 architectures:
32 - amd64
33diff --git a/hooks/charmhelpers/core/host_factory/ubuntu.py b/hooks/charmhelpers/core/host_factory/ubuntu.py
34index 3edc068..bc399f3 100644
35--- a/hooks/charmhelpers/core/host_factory/ubuntu.py
36+++ b/hooks/charmhelpers/core/host_factory/ubuntu.py
37@@ -25,7 +25,8 @@ UBUNTU_RELEASES = (
38 'cosmic',
39 'disco',
40 'eoan',
41- 'focal'
42+ 'focal',
43+ 'jammy',
44 )
45
46
47diff --git a/metadata.yaml b/metadata.yaml
48index 51d4912..5a26ee5 100644
49--- a/metadata.yaml
50+++ b/metadata.yaml
51@@ -9,13 +9,7 @@ description:
52 apps to avoid storing large chunks of data in Apache memory, and to share
53 this burden across several machines.
54 tags: ["system"]
55-series:
56- - xenial
57- - trusty
58- - bionic
59- - disco
60- - eoan
61- - focal
62+series: []
63 provides:
64 cache:
65 interface: memcache
66diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
67index edb9dd4..a05653f 100644
68--- a/tests/functional/requirements.txt
69+++ b/tests/functional/requirements.txt
70@@ -1,3 +1,5 @@
71 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
72 charmhelpers>=0.20.8
73 charms.reactive>=1.3.0
74+python-openstackclient
75+keystoneauth1
76diff --git a/tests/functional/tests/bundles/bionic.yaml b/tests/functional/tests/bundles/bionic.yaml
77index f39d302..21903d5 100644
78--- a/tests/functional/tests/bundles/bionic.yaml
79+++ b/tests/functional/tests/bundles/bionic.yaml
80@@ -2,13 +2,13 @@ series: bionic
81
82 applications:
83 mediawiki:
84- charm: cs:mediawiki
85+ charm: mediawiki
86 num_units: 1
87 series: trusty
88 memcached:
89 num_units: 1
90 nrpe:
91- charm: cs:nrpe
92+ charm: nrpe
93 num_units: 0
94
95 relations:
96diff --git a/tests/functional/tests/bundles/focal.yaml b/tests/functional/tests/bundles/focal.yaml
97index 6629a5d..a53e2d4 100644
98--- a/tests/functional/tests/bundles/focal.yaml
99+++ b/tests/functional/tests/bundles/focal.yaml
100@@ -2,13 +2,13 @@ series: focal
101
102 applications:
103 mediawiki:
104- charm: cs:mediawiki
105+ charm: mediawiki
106 num_units: 1
107 series: trusty
108 memcached:
109 num_units: 1
110 nrpe:
111- charm: cs:nrpe
112+ charm: nrpe
113 num_units: 0
114
115 relations:
116diff --git a/tests/functional/tests/bundles/trusty.yaml b/tests/functional/tests/bundles/jammy.yaml
117similarity index 78%
118rename from tests/functional/tests/bundles/trusty.yaml
119rename to tests/functional/tests/bundles/jammy.yaml
120index 33a9d8a..7afd2bd 100644
121--- a/tests/functional/tests/bundles/trusty.yaml
122+++ b/tests/functional/tests/bundles/jammy.yaml
123@@ -1,15 +1,16 @@
124-series: trusty
125+series: jammy
126
127 applications:
128 mediawiki:
129- charm: cs:mediawiki
130+ charm: mediawiki
131 num_units: 1
132 series: trusty
133 memcached:
134 num_units: 1
135 nrpe:
136- charm: cs:nrpe
137+ charm: nrpe
138 num_units: 0
139+ channel: latest/edge
140
141 relations:
142 - - memcached:cache
143diff --git a/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
144index 0268501..b9c2595 100644
145--- a/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
146+++ b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
147@@ -1,3 +1,3 @@
148 applications:
149 {{ charm_name }}:
150- charm: "{{ PROJECTPATH }}/{{ charm_name }}.charm"
151+ charm: "{{ CHARM_PROJECTPATH }}/{{ charm_name }}.charm"
152diff --git a/tests/functional/tests/bundles/trusty-replication.yaml b/tests/functional/tests/bundles/trusty-replication.yaml
153deleted file mode 100644
154index 6ec4e48..0000000
155--- a/tests/functional/tests/bundles/trusty-replication.yaml
156+++ /dev/null
157@@ -1,20 +0,0 @@
158-series: trusty
159-
160-applications:
161- mediawiki:
162- charm: cs:mediawiki
163- num_units: 1
164- series: trusty
165- memcached:
166- num_units: 2
167- options:
168- repcached: True
169- nrpe:
170- charm: cs:nrpe
171- num_units: 0
172-
173-relations:
174- - - memcached:cache
175- - mediawiki:cache
176- - - memcached:nrpe-external-master
177- - nrpe:nrpe-external-master
178diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
179index aeb9336..42b652f 100644
180--- a/tests/functional/tests/tests.yaml
181+++ b/tests/functional/tests/tests.yaml
182@@ -1,10 +1,9 @@
183 charm_name: memcached
184 gate_bundles:
185+ - jammy
186 - focal
187 - bionic
188 - xenial
189- - trusty
190- - trusty-replication
191 smoke_bundles:
192 - focal
193 dev_bundles:
194diff --git a/tox.ini b/tox.ini
195index 439a2b8..c5967bd 100644
196--- a/tox.ini
197+++ b/tox.ini
198@@ -11,6 +11,7 @@ passenv =
199 HOME
200 PATH
201 CHARM_BUILD_DIR
202+ CHARM_PROJECTPATH
203 PYTEST_KEEP_MODEL
204 PYTEST_CLOUD_NAME
205 PYTEST_CLOUD_REGION
206@@ -21,6 +22,20 @@ passenv =
207 NO_PROXY
208 SNAP_HTTP_PROXY
209 SNAP_HTTPS_PROXY
210+ OS_REGION_NAME
211+ OS_AUTH_VERSION
212+ OS_AUTH_URL
213+ OS_PROJECT_DOMAIN_NAME
214+ OS_USERNAME
215+ OS_PASSWORD
216+ OS_PROJECT_ID
217+ OS_USER_DOMAIN_NAME
218+ OS_PROJECT_NAME
219+ OS_IDENTITY_API_VERSION
220+ CS_*
221+ TEST*
222+ TERM
223+
224
225 [testenv:lint]
226 commands =

Subscribers

People subscribed via source and target branches

to all changes: