MDBF-1192: C/ODBC MacOS builder

configuration/builders/definitions/connectors/conodbc.py

@@ -11,6 +11,7 @@
     deb_pkg_tests,
     get_source_package,
     git_clone_sq,
+    macos,
     rpm,
     rpm_pkg_tests,
     save_packages,
@@ -271,3 +272,8 @@ def generate_deb_release_sq(ops, version):
         get_source_from_git=True,
     ),
 )
+
+MACOS_BUILDER = GenericBuilder(
+    name="codbc-aarch64-macos",
+    sequences=[macos(jobs=util.Property("jobs"))],
+)

configuration/builders/sequences/connectors/conodbc.py

@@ -805,3 +805,74 @@ def save_packages(config: DockerConfig, packages: list[str], user: str = "buildb
         )
     )
     return sequence
+
+
+def macos(jobs: int):
+    sequence = BuildSequence()
+    sequence.add_step(ShellStep(command=PrintEnvironmentDetails()))
+
+    sequence.add_step(git_clone_step())
+
+    sequence.add_step(
+        ShellStep(
+            command=ConfigureMariaDBCMake(
+                name="RelWithDebugInfo",
+                cmake_generator=CMakeGenerator(
+                    flags=[
+                        CMakeOption(CMAKE.BUILD_TYPE, BuildType.RELWITHDEBUG),
+                        CMakeOption(WITH.OPENSSL, True),
+                        CMakeOption(WITH.SIGNCODE, False),
+                        CMakeOption(WITH.EXTERNAL_ZLIB, True),
+                        CMakeOption(OTHER.CONC_WITH_UNIT_TESTS, False),
+                        CMakeOption(
+                            OTHER.ODBC_INCLUDE_DIR, "/opt/homebrew/opt/libiodbc/include"
+                        ),
+                        CMakeOption(
+                            OTHER.ODBC_LIB_DIR, "/opt/homebrew/opt/libiodbc/lib"
+                        ),
+                    ],
+                ),
+            ),
+            options=StepOptions(
+                description="Configure CMake",
+                descriptionDone="CMake configured",
+            ),
+        ),
+    )
+
+    sequence.add_step(
+        ShellStep(
+            command=CompileCMakeCommand(
+                jobs=jobs,
+                config=BuildType.RELWITHDEBUG,
+            ),
+            options=StepOptions(
+                description="Build package",
+                descriptionDone="Package built",
+            ),
+        ),
+    )
+
+    sequence.add_step(
+        ShellStep(
+            command=BashCommand(
+                name="ODBC ctest",
+                cmd="export TEST_DRIVER=$(find $(pwd) -name 'libmaodbc.dylib' -maxdepth 2 -print -quit) && cd test && ctest --output-on-failure",
+            ),
+            env_vars=[
+                ("ODBCINI", "odbc.ini"),
+                ("ODBCINSTINI", "odbcinst.ini"),
+                ("TEST_UID", "root"),
+                ("TEST_PASSWORD", "test"),
+                ("TEST_PORT", "3306"),
+                ("TEST_SCHEMA", "test"),
+                ("TEST_DSN", "maodbc_test"),
+                ("TEST_SOCKET", ""),
+            ],
+            options=StepOptions(
+                description="Run ODBC ctest",
+                descriptionDone="ODBC ctest done",
+            ),
+        ),
+    )
+    return sequence

configuration/schedulers/connectors.py

@@ -40,7 +40,7 @@
                 for builder in builders
             )
         ]
-        + [odbc_builders.UBASAN_BUILDER.name],
+        + [odbc_builders.UBASAN_BUILDER.name, odbc_builders.MACOS_BUILDER.name],
     ),
 ]
 

configuration/steps/commands/compile.py

@@ -3,6 +3,7 @@
 
 from buildbot.plugins import util
 from configuration.steps.commands.base import Command
+from configuration.steps.generators.cmake.options import BuildType
 
 
 class MAKE(Enum):
@@ -72,6 +73,8 @@ class CompileCMakeCommand(Command):
         builddir (str): The directory where the build files are located.
         verbose (bool): Whether to enable verbose output.
         workdir (PurePath): The working directory for the command.
+        target (MAKE): The Make target to build.
+        config (BuildType): The build configuration type.
     """
 
     def __init__(
@@ -81,6 +84,7 @@ def __init__(
         verbose: bool = False,
         workdir: PurePath = PurePath("."),
         target: MAKE = None,
+        config: BuildType = None,
     ):
         self.verbose = verbose
         self.builddir = builddir
@@ -89,6 +93,7 @@ def __init__(
         super().__init__(
             name=f"Compile {target.value if target else ''}", workdir=workdir
         )
+        self.config = config
 
     def as_cmd_arg(self) -> list[str]:
         r_list = [
@@ -103,6 +108,9 @@ def as_cmd_arg(self) -> list[str]:
         if self.target:
             r_list.append("--target")
             r_list.append(self.target.value)
+        if self.config:
+            r_list.append("--config")
+            r_list.append(self.config.value)
         return r_list
 
 

configuration/steps/generators/cmake/options.py

@@ -104,6 +104,8 @@ class WITH(StrEnum):
     WSREP = "WSREP"
     ZLIB = "ZLIB"
     OPENSSL = "OPENSSL"
+    SIGNCODE = "SIGNCODE"
+    EXTERNAL_ZLIB = "EXTERNAL_ZLIB"
 
     def __str__(self):
         return f"WITH_{self.value}"
@@ -137,6 +139,8 @@ class OTHER(StrEnum):
     CPACK_GENERATOR = "CPACK_GENERATOR"
     MARIADB_LINK_DYNAMIC = "MARIADB_LINK_DYNAMIC"
     USE_SYSTEM_INSTALLED_LIB = "USE_SYSTEM_INSTALLED_LIB"
+    ODBC_INCLUDE_DIR = "ODBC_INCLUDE_DIR"
+    ODBC_LIB_DIR = "ODBC_LIB_DIR"
 
 
 # Flag values use CapitalCase

master-migration/master.cfg

@@ -318,6 +318,15 @@ c["builders"].append(
     )
 )
 
+# Connector/ODBC macOS builder
+c["builders"].append(
+    conc_odbc_builders.MACOS_BUILDER.get_config(
+        workers=WORKER_POOL.get_workers_for_arch(arch="aarch64", names=["bbw3-mac"]),
+        tags=["connector", "odbc", "macos"],
+        jobs=1,
+    )
+)
+
 ## ------------------------------------------------------------------- ##
 ##                             REPORTERS                               ##
 ## ------------------------------------------------------------------- ##