From a42b12725ab37df74a96e85f7c644c90bd6e30f6 Mon Sep 17 00:00:00 2001
From: Max Kainov <maxkaynov@gmail.com>
Date: Fri, 16 Aug 2024 17:39:09 +0200
Subject: [PATCH] CI: Native build for package_aarch64

---
 tests/ci/ci_config.py      |  3 ++-
 tests/ci/ci_definitions.py |  1 +
 tests/ci/test_ci_config.py | 14 ++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index 7a19eb6f827..173c6c9c931 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -94,7 +94,8 @@ class CI:
                 package_type="deb",
                 static_binary_name="aarch64",
                 additional_pkgs=True,
-            )
+            ),
+            runner_type=Runners.BUILDER_ARM,
         ),
         BuildNames.PACKAGE_ASAN: CommonJobConfigs.BUILD.with_properties(
             build_config=BuildConfig(
diff --git a/tests/ci/ci_definitions.py b/tests/ci/ci_definitions.py
index 48847b0d7a6..1bed9db06f2 100644
--- a/tests/ci/ci_definitions.py
+++ b/tests/ci/ci_definitions.py
@@ -57,6 +57,7 @@ class Runners(metaclass=WithIter):
     """
 
     BUILDER = "builder"
+    BUILDER_ARM = "builder-aarch64"
     STYLE_CHECKER = "style-checker"
     STYLE_CHECKER_ARM = "style-checker-aarch64"
     FUNC_TESTER = "func-tester"
diff --git a/tests/ci/test_ci_config.py b/tests/ci/test_ci_config.py
index 525b3bf367b..c3e55aeac06 100644
--- a/tests/ci/test_ci_config.py
+++ b/tests/ci/test_ci_config.py
@@ -35,10 +35,16 @@ class TestCIConfig(unittest.TestCase):
                     f"Job [{job}] must have style-checker(-aarch64) runner",
                 )
             elif "binary_" in job.lower() or "package_" in job.lower():
-                self.assertTrue(
-                    CI.JOB_CONFIGS[job].runner_type == CI.Runners.BUILDER,
-                    f"Job [{job}] must have [{CI.Runners.BUILDER}] runner",
-                )
+                if job.lower() == CI.BuildNames.PACKAGE_AARCH64:
+                    self.assertTrue(
+                        CI.JOB_CONFIGS[job].runner_type in (CI.Runners.BUILDER_ARM,),
+                        f"Job [{job}] must have [{CI.Runners.BUILDER_ARM}] runner",
+                    )
+                else:
+                    self.assertTrue(
+                        CI.JOB_CONFIGS[job].runner_type in (CI.Runners.BUILDER,),
+                        f"Job [{job}] must have [{CI.Runners.BUILDER}] runner",
+                    )
             elif "aarch64" in job.lower():
                 self.assertTrue(
                     "aarch" in CI.JOB_CONFIGS[job].runner_type,