From af1e367f6726fbc33f1883b6c76cb27329a2d6eb Mon Sep 17 00:00:00 2001
From: Ryan Moeller <ryan@iXsystems.com>
Date: Fri, 24 Jul 2020 17:47:28 -0400
Subject: [PATCH] Add some FreeBSD arm64 arch builders

---
 master/master.cfg | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/master/master.cfg b/master/master.cfg
index 5f6e4a9..dc5e1db 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -11,6 +11,7 @@ from buildbot.buildslave import BuildSlave
 from buildbot.plugins import util
 from buildbot.schedulers.timed import Nightly
 
+from functools import partial
 import requests
 import os.path
 import copy
@@ -486,17 +487,13 @@ def freebsd_ami(abi, version):
     data = response.json()
     return data['ImageId']
 
-def get_freebsd12_image(slave):
-    slave.ami = freebsd_ami("amd64", "12.2-STABLE")
+def get_freebsd_image(abi, version, slave):
+    slave.ami = freebsd_ami(abi, version)
     return slave.conn.get_image(slave.ami)
 
-def get_freebsd13_image(slave):
-    slave.ami = freebsd_ami("amd64", "13.0-STABLE")
-    return slave.conn.get_image(slave.ami)
-
-def get_freebsd14_image(slave):
-    slave.ami = freebsd_ami("amd64", "14.0-CURRENT")
-    return slave.conn.get_image(slave.ami)
+FREEBSD_STABLE12 = "12.2-STABLE"
+FREEBSD_STABLE13 = "13.0-STABLE"
+FREEBSD_MAIN = "14.0-CURRENT"
 
 #
 # Architecture slaves
@@ -532,11 +529,19 @@ debian8_ppc64_slave = [
         slave_userpass["Debian-8-ppc64-buildslave2"]),
 ]
 
+freebsd14_arm64_slave = [
+    BuildSlave(
+        name="FreeBSD-main-arm64-buildslave%s" % (str(i+1)),
+        get_image=partial(get_freebsd_image, "arm64", FREEBSD_MAIN),
+    ) for i in range(0, numarchslaves)
+]
+
 arch_slaves = \
     ubuntu16_i386_slave + \
     debian8_arm_slave + \
     debian10_arm64_slave + \
     debian8_ppc64_slave
+    freebsd14_arm64_slave
 
 #
 # Platform test slaves
@@ -602,21 +607,21 @@ ubuntu20_x86_64_testslave = [
 freebsd12_amd64_testslave = [
     ZFSEC2TestSlave(
         name="FreeBSD-stable/12-amd64-testslave%s" % (str(i+1)),
-        get_image=get_freebsd12_image
+        get_image=partial(get_freebsd_image, "amd64", FREEBSD_STABLE12),
     ) for i in range(0, numtestslaves)
 ]
 
 freebsd13_amd64_testslave = [
     ZFSEC2TestSlave(
         name="FreeBSD-stable/13-amd64-testslave%s" % (str(i+1)),
-        get_image=get_freebsd13_image
+        get_image=partial(get_freebsd_image, "amd64", FREEBSD_STABLE13),
     ) for i in range(0, numtestslaves)
 ]
 
 freebsd14_amd64_testslave = [
     ZFSEC2TestSlave(
         name="FreeBSD-main-amd64-testslave%s" % (str(i+1)),
-        get_image=get_freebsd14_image
+        get_image=partial(get_freebsd_image, "amd64", FREEBSD_MAIN),
     ) for i in range(0, numtestslaves)
 ]