Support native and cross builds

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>

tools/ci/gitlab-ci/arm_cross_compile.yml

+.use-debian/arm64_build:
+  extends:
+    - .use-debian/x86_64_build
+  needs:
+    - job: debian/x86_64_build

tools/ci/gitlab-ci/arm_native_compile.yml

+debian/arm64_build:
+  extends:
+    - .debian-arm64
+    - .fdo.container-build@debian
+  tags:
+    - aarch64
+  stage: container
+
+.use-debian/arm64_build:
+  tags:
+    - aarch64
+  extends:
+    - .debian-arm64
+    - .fdo.suffixed-image@debian
+  needs:
+    - job: debian/arm64_build

tools/ci/gitlab-ci/build.yml

@@ -16,16 +16,19 @@ build:x86_64:
   extends:
   - .use-debian/x86_64_build
   - .build-common
+  - .x86_64-config
 
 build:arm64:
   extends:
   - .use-debian/arm64_build
   - .build-common
+  - .arm64-config
 
 build:arm32:
   extends:
-  - .use-debian/arm32_build
+  - .use-debian/arm64_build
   - .build-common
+  - .arm32-config
 
 build-docs:
   extends:

tools/ci/gitlab-ci/ci-scripts/ici-functions.sh

@@ -37,8 +37,10 @@ ici_prepare_build() {
         GCC_ARCH="x86_64-linux-gnu"
     fi
 
-    # do not set ARCH and CROSS_COMPILE if KCI_KERNEL_ARCH is not set, useful for local run
-    if [ -n "$KCI_KERNEL_ARCH" ]; then
+    # Set ARCH and CROSS_COMPILE if:
+    # - The kernel architecture is "arm" (default cross-compilation case), or
+    # - The CI server host is not "gitlab.freedesktop.org"
+    if [[ "$KCI_KERNEL_ARCH" = "arm" ]] || [[ "$CI_SERVER_HOST" != "gitlab.freedesktop.org" ]]; then
         export ARCH=${KCI_KERNEL_ARCH}
         export CROSS_COMPILE="${GCC_ARCH}-"
     fi

tools/ci/gitlab-ci/container.yml

@@ -2,6 +2,14 @@
 #
 # Copyright (C) 2024 Collabora, Helen Koike <helen.koike@collabora.com>
 
+include:
+  - local: 'tools/ci/gitlab-ci/arm_native_compile.yml'
+    rules:
+      - if: '$CI_SERVER_HOST == "gitlab.freedesktop.org"'
+  - local: 'tools/ci/gitlab-ci/arm_cross_compile.yml'
+    rules:
+      - if: '$CI_SERVER_HOST != "gitlab.freedesktop.org"'
+
 variables:
   FDO_REPO_SUFFIX: "$BUILD_OS/$KCI_BUILD_ARCH"
   FDO_DISTRIBUTION_TAG: "2024-12-24-debian"
@@ -25,45 +33,40 @@ variables:
       latexmk librsvg2-bin texlive-lang-chinese texlive-xetex meson libdrm-dev
       curl virtme-ng udev
 
-.debian-x86_64:
-  extends:
-    - .debian
+.x86_64-config:
   variables:
-    KCI_BUILD_ARCH: "x86-64"
     KCI_KERNEL_ARCH: "x86_64"
     KCI_DEFCONFIG: "x86_64_defconfig"
     KCI_KERNEL_IMAGE_NAME: "bzImage"
 
-.debian-arm64:
-  extends:
-    - .debian
+.arm64-config:
   variables:
-    KCI_BUILD_ARCH: "arm64"
     KCI_KERNEL_ARCH: "arm64"
     KCI_DEFCONFIG: "defconfig"
     KCI_KERNEL_IMAGE_NAME: "Image"
 
-.debian-arm32:
-  extends:
-    - .debian
+.arm32-config:
   variables:
-    KCI_BUILD_ARCH: "arm64"
     KCI_KERNEL_ARCH: "arm"
     KCI_DEFCONFIG: "multi_v7_defconfig"
     KCI_KERNEL_IMAGE_NAME: "zImage"
 
-debian/x86_64_build:
+.debian-x86_64:
   extends:
-    - .debian-x86_64
-    - .fdo.container-build@debian
-  stage: container
+    - .debian
+  variables:
+    KCI_BUILD_ARCH: "x86-64"
 
-debian/arm64_build:
+.debian-arm64:
+  extends:
+    - .debian
+  variables:
+    KCI_BUILD_ARCH: "arm64"
+
+debian/x86_64_build:
   extends:
-    - .debian-arm64
+    - .debian-x86_64
     - .fdo.container-build@debian
-  tags:
-    - aarch64
   stage: container
 
 .use-debian/x86_64_build:
@@ -72,21 +75,3 @@ debian/arm64_build:
     - .fdo.suffixed-image@debian
   needs:
     - job: debian/x86_64_build
-
-.use-debian/arm64_build:
-  tags:
-    - aarch64
-  extends:
-    - .debian-arm64
-    - .fdo.suffixed-image@debian
-  needs:
-    - job: debian/arm64_build
-
-.use-debian/arm32_build:
-  tags:
-    - aarch64
-  extends:
-    - .debian-arm32
-    - .fdo.suffixed-image@debian
-  needs:
-    - job: debian/arm64_build

tools/ci/gitlab-ci/gitlab-ci.yml

@@ -36,6 +36,9 @@ variables:
   SMATCH_DB_DIR: /smatch/smatch_data
   # exit code of bash script on `script` will be the exit code of the job
   FF_USE_NEW_BASH_EVAL_STRATEGY: "true"
+  KCI_SCENARIO:
+    description: Set to any non-empty value to disable scenarios
+    value: ""
 
 default:
   artifacts:

tools/ci/gitlab-ci/scenarios/drm/drm.yml

@@ -12,40 +12,31 @@ build:x86_64:
   variables:
     KCI_KCONFIGS_ENABLE: "DRM_VKMS DRM_BOCHS"
 
-# Build IGT for testing on devices
-# TODO: Fix cross compilation issue
-.igt:arm32:
-  extends:
-    - .use-debian/arm64_build
-    - build:arm32
+.igt:
+  stage: build
   script:
     - FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash ./tools/ci/gitlab-ci/scenarios/drm/build-igt.sh
-  stage: build
   artifacts:
     when: always
     paths:
       - artifacts/
 
+# Build IGT for testing on devices
+# TODO: Fix cross compilation issue
+.igt:arm32:
+  extends:
+    - .arm32-config
+    - .use-debian/arm64_build
+    - .igt
+
 igt:arm64:
   extends:
+    - .arm64-config
     - .use-debian/arm64_build
-    - build:arm64
-  script:
-    - FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash ./tools/ci/gitlab-ci/scenarios/drm/build-igt.sh
-  stage: build
-  artifacts:
-    when: always
-    paths:
-      - artifacts/
+    - .igt
 
 igt:x86_64:
   extends:
+    - .x86_64-config
     - .use-debian/x86_64_build
-    - build:x86_64
-  script:
-    - FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash ./tools/ci/gitlab-ci/scenarios/drm/build-igt.sh
-  stage: build
-  artifacts:
-    when: always
-    paths:
-      - artifacts/
+    - .igt

tools/ci/gitlab-ci/static-checks.yml

@@ -6,6 +6,7 @@
   stage: static-checks
   extends:
     - .use-debian/x86_64_build
+    - .x86_64-config
 
 checkpatch:
   extends: .static-checks