diff --git a/charms/slurmctld/charmcraft.yaml b/charms/slurmctld/charmcraft.yaml index 81679c5..35233bc 100644 --- a/charms/slurmctld/charmcraft.yaml +++ b/charms/slurmctld/charmcraft.yaml @@ -1,5 +1,6 @@ # Copyright 2020 Omnivector Solutions, LLC # See LICENSE file for licensing details. + name: slurmctld summary: | Slurmctld, the central management daemon of Slurm. @@ -43,6 +44,19 @@ bases: channel: "22.04" architectures: [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 config: options: diff --git a/charms/slurmd/charmcraft.yaml b/charms/slurmd/charmcraft.yaml index a3f5a00..12e454f 100644 --- a/charms/slurmd/charmcraft.yaml +++ b/charms/slurmd/charmcraft.yaml @@ -34,7 +34,18 @@ bases: architectures: [amd64] parts: - charm: {} + 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 nhc: plugin: nil build-packages: diff --git a/charms/slurmdbd/charmcraft.yaml b/charms/slurmdbd/charmcraft.yaml index 35790f7..89f3c91 100644 --- a/charms/slurmdbd/charmcraft.yaml +++ b/charms/slurmdbd/charmcraft.yaml @@ -25,14 +25,6 @@ links: source: - https://github.com/charmed-hpc/slurm-charms -requires: - database: - interface: mysql_client - -provides: - slurmctld: - interface: slurmdbd - bases: - build-on: - name: ubuntu @@ -41,3 +33,25 @@ bases: - name: ubuntu channel: "22.04" architectures: [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 + +requires: + database: + interface: mysql_client + +provides: + slurmctld: + interface: slurmdbd diff --git a/charms/slurmrestd/charmcraft.yaml b/charms/slurmrestd/charmcraft.yaml index d90d202..ee18670 100644 --- a/charms/slurmrestd/charmcraft.yaml +++ b/charms/slurmrestd/charmcraft.yaml @@ -19,11 +19,6 @@ links: source: - https://github.com/charmed-hpc/slurm-charms -provides: - slurmctld: - interface: slurmrestd - limit: 1 - assumes: - juju @@ -36,3 +31,22 @@ bases: - name: ubuntu channel: "22.04" architectures: [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 + +provides: + slurmctld: + interface: slurmrestd + limit: 1