Skip to content

Commit

Permalink
feat(all): upgrade charms to noble
Browse files Browse the repository at this point in the history
Upgrade charms from Jammy to Noble. Key changes are that the charms
now use the `base` & `platform` syntax, and the charms now
use the `charm-binary-python-packages` to install rust-based
packages. This helps shorten the build times from ~10 minutes
to roughly ~2 minutes.

Signed-off-by: Jason C. Nucciarone <[email protected]>
  • Loading branch information
NucciTheBoss committed Dec 6, 2024
1 parent 2e32198 commit 7c06d0c
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 81 deletions.
25 changes: 6 additions & 19 deletions charms/slurmctld/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,15 @@ assumes:
- juju

type: charm
bases:
- build-on:
- name: ubuntu
channel: "22.04"
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
base: [email protected]
platforms:
amd64:

parts:
charm:
charm-requirements: ["requirements.txt"]
override-build: |
cp /usr/bin/rustc-1.80 /usr/bin/rustc
craftctl default
build-packages:
- libffi-dev
- libssl-dev
- rustc-1.80
- cargo
- pkg-config
- git
charm-binary-python-packages:
- cryptography ~= 44.0.0
- pydantic

config:
options:
Expand Down
2 changes: 1 addition & 1 deletion charms/slurmctld/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ops==2.15.0
distro==1.9.0
slurmutils~=0.8.0
slurmutils~=0.9.0
26 changes: 6 additions & 20 deletions charms/slurmd/charmcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: slurmd
type: charm

summary: |
Slurmd, the compute node daemon of Slurm.
Expand All @@ -24,28 +23,15 @@ links:
assumes:
- juju

bases:
- build-on:
- name: ubuntu
channel: "22.04"
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
type: charm
base: [email protected]
platforms:
amd64:

parts:
charm:
charm-requirements: [ "requirements.txt" ]
override-build: |
cp /usr/bin/rustc-1.80 /usr/bin/rustc
craftctl default
build-packages:
- libffi-dev
- libssl-dev
- rustc-1.80
- cargo
- pkg-config
- git
charm-binary-python-packages:
- cryptography ~= 44.0.0
nhc:
plugin: nil
build-packages:
Expand Down
27 changes: 7 additions & 20 deletions charms/slurmdbd/charmcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2020-2024 Omnivector, LLC.
# See LICENSE file for licensing details.

name: slurmdbd
type: charm

assumes:
- juju
Expand All @@ -25,28 +25,15 @@ links:
source:
- https://github.com/charmed-hpc/slurm-charms

bases:
- build-on:
- name: ubuntu
channel: "22.04"
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
type: charm
base: [email protected]
platforms:
amd64:

parts:
charm:
charm-requirements: ["requirements.txt"]
override-build: |
cp /usr/bin/rustc-1.80 /usr/bin/rustc
craftctl default
build-packages:
- libffi-dev
- libssl-dev
- rustc-1.80
- cargo
- pkg-config
- git
charm-binary-python-packages:
- cryptography ~= 44.0.0

requires:
database:
Expand Down
2 changes: 1 addition & 1 deletion charms/slurmdbd/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ops==2.15.0
distro==1.9.0
slurmutils~=0.8.0
slurmutils~=0.9.0
24 changes: 5 additions & 19 deletions charms/slurmrestd/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,14 @@ assumes:
- juju

type: charm
bases:
- build-on:
- name: ubuntu
channel: "22.04"
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
base: [email protected]
platforms:
amd64:

parts:
charm:
charm-requirements: ["requirements.txt"]
override-build: |
cp /usr/bin/rustc-1.80 /usr/bin/rustc
craftctl default
build-packages:
- libffi-dev
- libssl-dev
- rustc-1.80
- cargo
- pkg-config
- git
charm-binary-python-packages:
- cryptography ~= 44.0.0

provides:
slurmctld:
Expand Down
2 changes: 1 addition & 1 deletion charms/slurmrestd/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ops==2.15.0
distro==1.9.0
slurmutils~=0.8.0
slurmutils~=0.9.0

0 comments on commit 7c06d0c

Please sign in to comment.