Build Packages - Add support for HL4/8 and 45Professional

.github/workflows/build-packages.yml

@@ -9,7 +9,7 @@ on:
       - 'v*.*.*'
 jobs:
   main:
-    runs-on: self-hosted
+    runs-on: deployinatorv1
     steps:
       - name: Checkout
         uses: actions/checkout@v2

dalias/example_config/PRO15

@@ -0,0 +1,15 @@
+1-1
+1-2
+1-3
+1-4
+1-5
+1-6
+1-7
+1-8
+1-9
+1-10
+1-11
+1-12
+1-13
+1-14
+1-15

dalias/example_config/PRO4

@@ -0,0 +1,4 @@
+1-1
+1-2
+1-3
+1-4

dalias/example_config/PRO8

@@ -0,0 +1,8 @@
+1-1
+1-2
+1-3
+1-4
+2-1
+2-2
+2-3
+2-4

manifest.json

@@ -68,8 +68,10 @@
         "version": "3.0.13",
         "buildVersion": "1",
         "ignore": [],
-        "date": null,
-        "packager": "Brett Kelly <[email protected]>",
-        "changes": []
+        "date": "2024-12-04T14:44:59.963037",
+        "packager": "Jordan Keough <[email protected]>",
+        "changes": [
+            "Adds support for HL4/8 and 45Professional"
+        ]
     }
 }

tools/dmap

@@ -436,6 +436,11 @@ def create_vdev_id(server):
 			"HL4":[4],
 			"HL8":[4,4],
 		},
+		"PROFESSIONAL":{
+			"PRO15":[15],
+			"PRO4":[4],
+			"PRO8":[4,4],
+		},
 		"STORNADO":{
 			"AV15":[16,16],
 			"F32":[16,16]
@@ -586,6 +591,10 @@ def create_vdev_id(server):
 		vdev_id_str += alias_hl4(server,alias_template)
 	elif server["Alias Style"] == "HOMELAB" and server["Chassis Size"] == "HL8":
 		vdev_id_str += alias_hl8(server,alias_template)
+	elif server["Alias Style"] == "PROFESSIONAL" and server["Chassis Size"] == "PRO4":
+		vdev_id_str += alias_pro4(server,alias_template)
+	elif server["Alias Style"] == "PROFESSIONAL" and server["Chassis Size"] == "PRO8":
+		vdev_id_str += alias_pro8(server,alias_template)
 	elif server["Alias Style"] == "?":
 		# we don't know what kind of server this is. Likely a vm
 		vdev_id_str = None
@@ -730,6 +739,52 @@ def alias_hl8(server,alias_template):
 
 	return vdev_id_str
 
+###############################################################################
+# Name: alias_pro4
+# Args: 
+# Desc: 
+###############################################################################
+def alias_pro4(server,alias_template):
+	vdev_id_str = ""
+	pro4_order = [1,2,3,4]
+
+	for i in range(0,len(pro4_order)):
+		vdev_id_str += (
+			"alias 1-{s} /dev/disk/by-path/pci-0000:00:17.0-ata-{p}\n".format(
+				s=i+1,p=pro4_order[i]
+			)
+		)
+
+	return vdev_id_str
+
+
+###############################################################################
+# Name: alias_pro8
+# Args: 
+# Desc: 
+###############################################################################
+def alias_pro8(server,alias_template):
+	vdev_id_str = ""
+	pro8_order1 = [1,2,3,4]
+	pro8_order2 = [5,6,7,8]
+
+	for i in range(0,len(pro8_order1)):
+		vdev_id_str += (
+			"alias 1-{s} /dev/disk/by-path/pci-0000:00:17.0-ata-{p}\n".format(
+				s=i+1,p=pro8_order1[i]
+			)
+		)
+
+	for i in range(0,len(pro8_order2)):
+		vdev_id_str += (
+			"alias 2-{s} /dev/disk/by-path/pci-0000:00:17.0-ata-{p}\n".format(
+				s=i+1,p=pro8_order2[i]
+			)
+		)
+
+	return vdev_id_str
+
+
 ###############################################################################
 # Name: alias_av15_base
 # Args: none

tools/lsdev

@@ -330,6 +330,11 @@ def build_server(options):
 			"HL4":[4],
 			"HL8":[4,4],
 		},
+  		"PROFESSIONAL":{
+			"PRO15":[15],
+			"PRO4":[4],
+			"PRO8":[4,4],
+		},
 		"STORNADO":{
 			"AV15":[32],
 			"F32":[32]

tools/server_identifier

@@ -21,20 +21,20 @@ g_product_lut_idx = {
 	"ALIAS_STYLE":	4
 }
 
-g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","2U","2UGW","1UGW","F2","HL15","VM8","VM16","VM32","HL4","HL8"]
+g_chassis_sizes = ["?","AV15","Q30","S45","XL60","F8X1","F8X2","F8X3","2U","2UGW","1UGW","F2","HL15","VM8","VM16","VM32","HL4","HL8","PRO4","PRO8","PRO15"]
 
 g_mobo_to_version_lut = {
-	"Base": ["X11SSH-CTF","X11SSM-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Base-B": ["X11SPL-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Enhanced": ["X11SPL-F","X10SRL-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Enhanced-S":["X11SPL-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Enhanced-AMD":["H11SSL-i","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Turbo": ["X11DPL-i","X10DRL-i","X12DPi-N6","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Turbo-G":["X11SPL-F","X12DPi-N6","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Good": ["H12SSL-i","H12SSL-I","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Better": ["H12SSL-i","H12SSL-I","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
-	"Best": ["H12SSL-i","H12SSL-I","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"],
- 	"Super": ["H12SSL-i","H12SSL-I","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000", "MC13-LE1-000"]
+	"Base": ["X11SSH-CTF","X11SSM-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Base-B": ["X11SPL-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Enhanced": ["X11SPL-F","X10SRL-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Enhanced-S":["X11SPL-F","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Enhanced-AMD":["H11SSL-i","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Turbo": ["X11DPL-i","X10DRL-i","X12DPi-N6","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Turbo-G":["X11SPL-F","X12DPi-N6","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Good": ["H12SSL-i","H12SSL-I","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Better": ["H12SSL-i","H12SSL-I","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+	"Best": ["H12SSL-i","H12SSL-I","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"],
+ 	"Super": ["H12SSL-i","H12SSL-I","ME03-CE0-000","MS03-6L0-000","MS73-HB0-000","MZ73-LM0-000","MC13-LE1-000","B550I AORUS PRO","EC266D2I-2T/AQC"]
 }
 
 g_product_lut = {
@@ -58,6 +58,10 @@ g_product_lut = {
 	"HomeLab-HL15":                     [g_mobo_to_version_lut["Turbo"],0,0,"HL15","HOMELAB"],
 	"HomeLab-HL4":             			[g_mobo_to_version_lut["Turbo"],0,0,"HL4","HOMELAB"],
 	"HomeLab-HL8":             			[g_mobo_to_version_lut["Turbo"],0,0,"HL8","HOMELAB"],
+
+ 	"Professional-PRO15":               [g_mobo_to_version_lut["Turbo"],0,1,"PRO15","PROFESSIONAL"],
+	"Professional-PRO4":             	[g_mobo_to_version_lut["Turbo"],0,0,"PRO4","PROFESSIONAL"],
+	"Professional-PRO8":             	[g_mobo_to_version_lut["Turbo"],0,0,"PRO8","PROFESSIONAL"],
 
 	"Storinator-AV15-Base":				[g_mobo_to_version_lut["Base"],0,0,"AV15","AV15-BASE"],
 	"Storinator-AV15-Base-B":			[g_mobo_to_version_lut["Base-B"],0,1,"AV15","STORINATOR"],
@@ -318,7 +322,8 @@ def getDmidecodePCI(server):
 		print("ERROR: dmidecode not installed")
 		exit(1)
 	pci_slots = []
-	rx_pci=re.compile(r"^Handle.*\n(?:.|\n)+?^.*(?:Designation:\s+).*(?:PCIE|SLOT|Slot)(.).*(?:.|\n)+?^.*Bus Address:\s+(\S+).*",re.MULTILINE)
+	# rx_pci=re.compile(r"^Handle.*\n(?:.|\n)+?^.*(?:Designation:\s+).*(?:PCIE|SLOT|Slot)(.).*(?:.|\n)+?^.*Bus Address:\s+(\S+).*",re.MULTILINE)
+	rx_pci = re.compile(r"^Handle.*\n(?:.|\n)+?^.*(?:Designation:\s+).*(?:PCIE|SLOT|Slot)(?:[^0-9]?(\d)).*(?:.|\n)+?^.*Bus Address:\s+(\S+).*",re.MULTILINE)
 	for match in rx_pci.finditer(dmidecode_result):
 		pci_slots.append({"ID":match.group(1),"Bus Address":match.group(2)})