Skip to content

Commit

Permalink
Add charmcraft 3 support
Browse files Browse the repository at this point in the history
Summary of changes:
- Update the charmcraft.yaml file to use base and platforms, only
  allowing noble support.
- Update config to default to caracal.
- Update osci.yaml to use the charmcraft 3.x/beta
- Drop non-noble tests
- Update constraints file from -2024.1.txt to -noble.txt
- Add charmbuild to .zuul.yaml

Change-Id: I5a6ba15bebf955ad84ed0b98f39f096d0970d4a0
  • Loading branch information
MylesJP committed Sep 4, 2024
1 parent fda9382 commit 84cf196
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 1,076 deletions.
6 changes: 5 additions & 1 deletion .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
templates:
- openstack-python3-charm-jobs
- openstack-cover-jobs

check:
jobs:
- charmbuild
vars:
charm_build_name: manila-ganesha
47 changes: 14 additions & 33 deletions charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,17 @@ parts:
build-environment:
- CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
- CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
bases:
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
base: [email protected]
platforms:
amd64:
build-on: amd64
build-for: amd64
arm64:
build-on: arm64
build-for: arm64
ppc64el:
build-on: ppc64el
build-for: ppc64el
s390x:
build-on: s390x
build-for: s390x
2 changes: 1 addition & 1 deletion osci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: manila-ganesha
build_type: charmcraft
charmcraft_channel: 2.x/stable
charmcraft_channel: 3.x/stable
13 changes: 13 additions & 0 deletions rename.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
echo "renaming ${charm}_*.charm to ${charm}.charm"
echo -n "pwd: "
pwd
ls -al
echo "Removing bad downloaded charm maybe?"
if [[ -e "${charm}.charm" ]];
then
rm "${charm}.charm"
fi
echo "Renaming charm here."
mv ${charm}_*.charm ${charm}.charm
2 changes: 0 additions & 2 deletions src/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ description: |
tags:
- storage
- file-servers
series:
- jammy
subordinate: false
extra-bindings:
tenant-storage:
Expand Down
Loading

0 comments on commit 84cf196

Please sign in to comment.