Add support for Rocky Linux (#175)

omnivector-solutions · Aug 4, 2023 · a3aa5c4 · a3aa5c4
1 parent acbdd9a
commit a3aa5c4
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,6 +7,7 @@ This file keeps track of all notable changes to the Slurm Charms.
 Unreleased
 ----------
 
+- added support for Rocky Linux
 - removed the nhc resource and packed the nhc tar file along with slurmd charm
 
 1.1.1 - 2023-06-27

diff --git a/Makefile b/Makefile
@@ -44,25 +44,25 @@ deepclean: clean ## Cleanup charmcraft/lxd
 slurmd: version ## Build slurmd
 	@cp version LICENSE icon.svg charm-slurmd/
 	@charmcraft pack --project-dir charm-slurmd ${VERBOSE}
-	@mv slurmd_ubuntu-22.04-amd64_ubuntu-20.04-amd64_centos-7-amd64.charm slurmd.charm
+	@mv slurmd_*.charm slurmd.charm
 
 .PHONY: slurmctld
 slurmctld: version ## pack slurmctld
 	@cp version LICENSE icon.svg charm-slurmctld/
 	@charmcraft pack --project-dir charm-slurmctld ${VERBOSE}
-	@mv slurmctld_ubuntu-22.04-amd64_ubuntu-20.04-amd64_centos-7-amd64.charm slurmctld.charm
+	@mv slurmctld_*.charm slurmctld.charm
 
 .PHONY: slurmdbd
 slurmdbd: version ## pack slurmdbd
 	@cp version LICENSE icon.svg charm-slurmdbd/
 	@charmcraft pack --project-dir charm-slurmdbd ${VERBOSE}
-	@mv slurmdbd_ubuntu-22.04-amd64_ubuntu-20.04-amd64_centos-7-amd64.charm slurmdbd.charm
+	@mv slurmdbd_*.charm slurmdbd.charm
 
 .PHONY: slurmrestd
 slurmrestd: version ## pack slurmrestd
 	@cp version LICENSE icon.svg charm-slurmrestd/
 	@charmcraft pack --project-dir charm-slurmrestd ${VERBOSE}
-	@mv slurmrestd_ubuntu-22.04-amd64_ubuntu-20.04-amd64_centos-7-amd64.charm slurmrestd.charm
+	@mv slurmrestd_*.charm slurmrestd.charm
 
 .PHONY: charms
 charms: readme slurmd slurmdbd slurmctld slurmrestd ## Build all charms

diff --git a/charm-slurmctld/charmcraft.yaml b/charm-slurmctld/charmcraft.yaml
@@ -13,6 +13,9 @@ bases:
       - name: centos
         channel: "7"
         architectures: [amd64]
+      - name: centos
+        channel: "8"
+        architectures: [amd64]
 parts:
   charm:
     build-packages: [git]

diff --git a/charm-slurmctld/dispatch b/charm-slurmctld/dispatch
@@ -33,10 +33,16 @@ then
 			echo "Running unsuppored version of centos: $major"
 			exit -1
 		fi
+	elif [[ $ID == 'rocky' ]]
+	then
+		dnf install epel-release -y
+		dnf install dnf-plugins-core -y
+		dnf config-manager --set-enabled powertools -y
+		dnf install make automake yum-utils -y
 	else
 		echo "Running unsuppored os: $ID"
 		exit -1
-	fi
+	fi	
 	touch .installed
 fi
 

diff --git a/charm-slurmctld/metadata.yaml b/charm-slurmctld/metadata.yaml
@@ -24,6 +24,7 @@ series:
     - focal
     - jammy
     - centos7
+    - centos8
 
 peers:
   slurmctld-peer:

diff --git a/charm-slurmctld/requirements.txt b/charm-slurmctld/requirements.txt
@@ -3,4 +3,4 @@ influxdb==5.3.1
 urllib3==1.26.9
 etcd3gw==1.0.2
 jinja2==3.1.2
-git+https://github.com/omnivector-solutions/[email protected].13
+git+https://github.com/omnivector-solutions/[email protected].15
diff --git a/charm-slurmd/charmcraft.yaml b/charm-slurmd/charmcraft.yaml
@@ -13,6 +13,9 @@ bases:
       - name: centos
         channel: "7"
         architectures: [amd64]
+      - name: centos
+        channel: "8"
+        architectures: [amd64]
 parts:
   charm:
     build-packages: [git]

diff --git a/charm-slurmd/dispatch b/charm-slurmd/dispatch
@@ -34,6 +34,12 @@ then
 			echo "Running unsuppored version of centos: $major"
 			exit -1
 		fi
+	elif [[ $ID == 'rocky' ]]
+	then
+		dnf install epel-release -y
+		dnf install dnf-plugins-core -y
+		dnf config-manager --set-enabled powertools -y
+		dnf install make automake yum-utils -y
 	else
 		echo "Running unsuppored os: $ID"
 		exit -1

diff --git a/charm-slurmd/metadata.yaml b/charm-slurmd/metadata.yaml
@@ -22,6 +22,7 @@ series:
     - focal
     - jammy
     - centos7
+    - centos8
 
 provides:
   slurmd:

diff --git a/charm-slurmd/requirements.txt b/charm-slurmd/requirements.txt
@@ -1,4 +1,4 @@
 ops==1.3.0
 urllib3==1.26.9
 etcd3gw==1.0.2
-git+https://github.com/omnivector-solutions/[email protected].13
+git+https://github.com/omnivector-solutions/[email protected].15
diff --git a/charm-slurmdbd/charmcraft.yaml b/charm-slurmdbd/charmcraft.yaml
@@ -13,6 +13,9 @@ bases:
       - name: centos
         channel: "7"
         architectures: [amd64]
+      - name: centos
+        channel: "8"
+        architectures: [amd64]
 parts:
   charm:
     build-packages: [git]

diff --git a/charm-slurmdbd/dispatch b/charm-slurmdbd/dispatch
@@ -33,6 +33,12 @@ then
 			echo "Running unsuppored version of centos: $major"
 			exit -1
 		fi
+	elif [[ $ID == 'rocky' ]]
+	then
+		dnf install epel-release -y
+		dnf install dnf-plugins-core -y
+		dnf config-manager --set-enabled powertools -y
+		dnf install make automake yum-utils -y
 	else
 		echo "Running unsuppored os: $ID"
 		exit -1

diff --git a/charm-slurmdbd/metadata.yaml b/charm-slurmdbd/metadata.yaml
@@ -21,6 +21,7 @@ series:
   - focal
   - jammy
   - centos7
+  - centos8
 
 provides:
   slurmdbd:

diff --git a/charm-slurmdbd/requirements.txt b/charm-slurmdbd/requirements.txt
@@ -1,2 +1,2 @@
 ops==1.3.0
-git+https://github.com/omnivector-solutions/[email protected].13
+git+https://github.com/omnivector-solutions/[email protected].15
diff --git a/charm-slurmrestd/charmcraft.yaml b/charm-slurmrestd/charmcraft.yaml
@@ -13,6 +13,9 @@ bases:
       - name: centos
         channel: "7"
         architectures: [amd64]
+      - name: centos
+        channel: "8"
+        architectures: [amd64]
 parts:
   charm:
     build-packages: [git]

diff --git a/charm-slurmrestd/dispatch b/charm-slurmrestd/dispatch
@@ -33,6 +33,12 @@ then
 			echo "Running unsuppored version of centos: $major"
 			exit -1
 		fi
+	elif [[ $ID == 'rocky' ]]
+	then
+		dnf install epel-release -y
+		dnf install dnf-plugins-core -y
+		dnf config-manager --set-enabled powertools -y
+		dnf install make automake yum-utils -y
 	else
 		echo "Running unsuppored os: $ID"
 		exit -1

diff --git a/charm-slurmrestd/metadata.yaml b/charm-slurmrestd/metadata.yaml
@@ -20,6 +20,7 @@ series:
     - focal
     - jammy
     - centos7
+    - centos8
 
 provides:
   slurmrestd:

diff --git a/charm-slurmrestd/requirements.txt b/charm-slurmrestd/requirements.txt
@@ -1,2 +1,2 @@
 ops==1.3.0
-git+https://github.com/omnivector-solutions/[email protected].13
+git+https://github.com/omnivector-solutions/[email protected].15