Module: Mesa
Branch: main
Commit: a181c86e73ff9ac78090cd8c1a0a2d559a8e8f5d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a181c86e73ff9ac78090cd8c1a0a2d559a8e8f5d
Author: Juan A. Suarez Romero <jasua...@igalia.com>
Date: Fri Nov 24 10:41:31 2023 +0100
broadcom/ci: separate hiden jobs to -inc.yml files
make it easier to re-use the hidden jobs by other project (e.g. linux)
without enabling the executable jobs.
Inspired on 9442571664e ("ci: separate hiden jobs to -inc.yml files").
Acked-by: David Heidelberg <david.heidelb...@collabora.com>
Reviewed-by: Eric Engestrom <e...@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26350>
---
src/broadcom/ci/gitlab-ci-inc.yml | 113 +++++++++++++++++++++++++++++++++++++
src/broadcom/ci/gitlab-ci.yml | 115 +-------------------------------------
2 files changed, 115 insertions(+), 113 deletions(-)
diff --git a/src/broadcom/ci/gitlab-ci-inc.yml
b/src/broadcom/ci/gitlab-ci-inc.yml
new file mode 100644
index 00000000000..ceca272744b
--- /dev/null
+++ b/src/broadcom/ci/gitlab-ci-inc.yml
@@ -0,0 +1,113 @@
+.broadcom-common-rules:
+ rules:
+ - changes: &broadcom_file_list
+ - src/broadcom/meson.build
+ - src/broadcom/ci/**/*
+ - src/broadcom/cle/**/*
+ - src/broadcom/clif/**/*
+ - src/broadcom/common/**/*
+ - src/broadcom/compiler/**/*
+ - src/broadcom/drm-shim/**/*
+ - src/broadcom/qpu/**/*
+ - src/broadcom/simulator/**/*
+ when: on_success
+
+.broadcom-common-manual-rules:
+ rules:
+ - changes: *broadcom_file_list
+ when: manual
+
+.vc4-rules:
+ stage: broadcom
+ rules:
+ - if: $FORCE_KERNEL_TAG != null
+ when: never
+ - !reference [.never-post-merge-rules, rules]
+ - !reference [.igalia-farm-rules, rules]
+ - !reference [.gl-rules, rules]
+ - !reference [.broadcom-common-rules, rules]
+ - changes: &vc4_file_list
+ - src/gallium/drivers/vc4/**/*
+ - src/gallium/winsys/vc4/**/*
+ - src/gallium/auxiliary/renderonly/**/*
+ - src/gallium/winsys/kmsro/**/*
+ when: on_success
+
+.vc4-manual-rules:
+ stage: broadcom
+ rules:
+ - !reference [.igalia-farm-manual-rules, rules]
+ - !reference [.gl-manual-rules, rules]
+ - !reference [.broadcom-common-manual-rules, rules]
+ - changes: *vc4_file_list
+ when: manual
+
+.v3d-rules:
+ stage: broadcom
+ rules:
+ - if: $FORCE_KERNEL_TAG != null
+ when: never
+ - !reference [.never-post-merge-rules, rules]
+ - !reference [.igalia-farm-rules, rules]
+ - !reference [.gl-rules, rules]
+ - !reference [.broadcom-common-rules, rules]
+ - changes: &v3d_file_list
+ - src/gallium/drivers/v3d/**/*
+ - src/gallium/winsys/v3d/**/*
+ - src/gallium/auxiliary/renderonly/**/*
+ - src/gallium/winsys/kmsro/**/*
+ when: on_success
+
+.v3d-manual-rules:
+ stage: broadcom
+ retry: !reference [.scheduled_pipeline-rules, retry]
+ rules:
+ - !reference [.igalia-farm-manual-rules, rules]
+ - !reference [.gl-manual-rules, rules]
+ - !reference [.broadcom-common-manual-rules, rules]
+ - changes:
+ *v3d_file_list
+ when: manual
+
+.v3dv-rules:
+ stage: broadcom
+ rules:
+ - if: $FORCE_KERNEL_TAG != null
+ when: never
+ - !reference [.never-post-merge-rules, rules]
+ - !reference [.igalia-farm-rules, rules]
+ - !reference [.vulkan-rules, rules]
+ - changes: &v3dv_file_list
+ - src/broadcom/**/*
+ when: on_success
+
+.v3dv-manual-rules:
+ stage: broadcom
+ rules:
+ - !reference [.igalia-farm-manual-rules, rules]
+ - !reference [.vulkan-manual-rules, rules]
+ - changes: *v3dv_file_list
+ when: manual
+
+
+.broadcom-test:
+ script:
+ - ./install/bare-metal/poe-powered.sh
+ variables:
+ HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
+ FLAKES_CHANNEL: "#videocore-ci"
+ timeout: 20m
+
+.broadcom-test:arm64:
+ extends:
+ - .broadcom-test
+ - .baremetal-test-arm64
+ variables:
+ BM_BOOTFS: /boot/raspberrypi_arm64
+
+.broadcom-test:arm32:
+ extends:
+ - .broadcom-test
+ - .baremetal-test-arm32
+ variables:
+ BM_BOOTFS: /boot/raspberrypi_armhf
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 90ed790f987..d942161f8b6 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -1,116 +1,5 @@
-.broadcom-common-rules:
- rules:
- - changes: &broadcom_file_list
- - src/broadcom/meson.build
- - src/broadcom/ci/**/*
- - src/broadcom/cle/**/*
- - src/broadcom/clif/**/*
- - src/broadcom/common/**/*
- - src/broadcom/compiler/**/*
- - src/broadcom/drm-shim/**/*
- - src/broadcom/qpu/**/*
- - src/broadcom/simulator/**/*
- when: on_success
-
-.broadcom-common-manual-rules:
- rules:
- - changes: *broadcom_file_list
- when: manual
-
-.vc4-rules:
- stage: broadcom
- rules:
- - if: $FORCE_KERNEL_TAG != null
- when: never
- - !reference [.never-post-merge-rules, rules]
- - !reference [.igalia-farm-rules, rules]
- - !reference [.gl-rules, rules]
- - !reference [.broadcom-common-rules, rules]
- - changes: &vc4_file_list
- - src/gallium/drivers/vc4/**/*
- - src/gallium/winsys/vc4/**/*
- - src/gallium/auxiliary/renderonly/**/*
- - src/gallium/winsys/kmsro/**/*
- when: on_success
-
-.vc4-manual-rules:
- stage: broadcom
- rules:
- - !reference [.igalia-farm-manual-rules, rules]
- - !reference [.gl-manual-rules, rules]
- - !reference [.broadcom-common-manual-rules, rules]
- - changes: *vc4_file_list
- when: manual
-
-.v3d-rules:
- stage: broadcom
- rules:
- - if: $FORCE_KERNEL_TAG != null
- when: never
- - !reference [.never-post-merge-rules, rules]
- - !reference [.igalia-farm-rules, rules]
- - !reference [.gl-rules, rules]
- - !reference [.broadcom-common-rules, rules]
- - changes: &v3d_file_list
- - src/gallium/drivers/v3d/**/*
- - src/gallium/winsys/v3d/**/*
- - src/gallium/auxiliary/renderonly/**/*
- - src/gallium/winsys/kmsro/**/*
- when: on_success
-
-.v3d-manual-rules:
- stage: broadcom
- retry: !reference [.scheduled_pipeline-rules, retry]
- rules:
- - !reference [.igalia-farm-manual-rules, rules]
- - !reference [.gl-manual-rules, rules]
- - !reference [.broadcom-common-manual-rules, rules]
- - changes:
- *v3d_file_list
- when: manual
-
-.v3dv-rules:
- stage: broadcom
- rules:
- - if: $FORCE_KERNEL_TAG != null
- when: never
- - !reference [.never-post-merge-rules, rules]
- - !reference [.igalia-farm-rules, rules]
- - !reference [.vulkan-rules, rules]
- - changes: &v3dv_file_list
- - src/broadcom/**/*
- when: on_success
-
-.v3dv-manual-rules:
- stage: broadcom
- rules:
- - !reference [.igalia-farm-manual-rules, rules]
- - !reference [.vulkan-manual-rules, rules]
- - changes: *v3dv_file_list
- when: manual
-
-
-.broadcom-test:
- script:
- - ./install/bare-metal/poe-powered.sh
- variables:
- HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
- FLAKES_CHANNEL: "#videocore-ci"
- timeout: 20m
-
-.broadcom-test:arm64:
- extends:
- - .broadcom-test
- - .baremetal-test-arm64
- variables:
- BM_BOOTFS: /boot/raspberrypi_arm64
-
-.broadcom-test:arm32:
- extends:
- - .broadcom-test
- - .baremetal-test-arm32
- variables:
- BM_BOOTFS: /boot/raspberrypi_armhf
+include:
+ - local: 'src/broadcom/ci/gitlab-ci-inc.yml'
vc4-rpi3-gl:arm32:
