Skip to content

Commit 9f9ab4b

Browse files
committed
ceph-fs: squid-jammy migration updates
Signed-off-by: Peter Sabaini <peter.sabaini@canonical.com>
1 parent 0b687d3 commit 9f9ab4b

File tree

5 files changed

+181
-180
lines changed

5 files changed

+181
-180
lines changed

ceph-fs/charmcraft.yaml

+25-25
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@ type: charm
22

33
parts:
44
charm:
5-
charm-entrypoint: "hooks/install"
5+
plugin: reactive
6+
reactive-charm-build-arguments:
7+
- --binary-wheels-from-source
8+
- -v
69
build-packages:
710
- tox
811
- git
912
- python3-dev
1013
- libffi-dev
11-
override-build: |
12-
apt-get install ca-certificates -y
13-
tox -e build-reactive
14-
override-stage: |
15-
echo "Copying charm to staging area: $CRAFT_STAGE"
16-
NAME=$(ls $CRAFT_PART_BUILD/build/builds)
17-
cp -r $CRAFT_PART_BUILD/build/builds/$NAME/* $CRAFT_STAGE/
18-
override-prime: |
19-
# For some reason, the normal priming chokes on the fact that there's a
20-
# hooks directory.
21-
cp -r $CRAFT_STAGE/* .
14+
source: src/
15+
build-snaps:
16+
- charm/latest/edge
17+
build-environment:
18+
- CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
19+
- CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
2220

23-
bases:
24-
- build-on:
25-
- name: ubuntu
26-
channel: "20.04"
27-
architectures:
28-
- amd64
29-
run-on:
30-
- name: ubuntu
31-
channel: "20.04"
32-
architectures: [amd64, s390x, ppc64el, arm64]
33-
- name: ubuntu
34-
channel: "22.04"
35-
architectures: [amd64, s390x, ppc64el, arm64]
21+
base: ubuntu@24.04
22+
build-base: ubuntu@24.04
23+
platforms:
24+
amd64:
25+
build-on: amd64
26+
build-for: amd64
27+
arm64:
28+
build-on: arm64
29+
build-for: arm64
30+
s390x:
31+
build-on: s390x
32+
build-for: s390x
33+
ppc64el:
34+
build-on: ppc64el
35+
build-for: ppc64el

ceph-fs/requirements.txt

-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
# This file is managed centrally by release-tools and should not be modified
2-
# within individual charm repos. See the 'global' dir contents for available
3-
# choices of *requirements.txt files for OpenStack Charms:
4-
# https://github.com/openstack-charmers/release-tools
5-
#
6-
# NOTE(lourot): This might look like a duplication of test-requirements.txt but
7-
# some tox targets use only test-requirements.txt whereas charm-build uses only
8-
# requirements.txt
9-
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
10-
111
# NOTE: newer versions of cryptography require a Rust compiler to build,
122
# see
133
# * https://github.com/openstack-charmers/zaza/issues/421
@@ -18,6 +8,3 @@ cryptography<3.4
188
git+https://github.com/juju/charm-tools.git
199

2010
simplejson
21-
22-
# https://github.com/juju/charm-tools/issues/674
23-
path<17.0.0

0 commit comments

Comments
 (0)