ci: Allow disabling the whole of the Collabora farm

Add a global-level variable that allows disabling all jobs that would
have gone to the Collabora lab, to be used in case of outages.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15150>
This commit is contained in:
Tomeu Vizoso 2022-02-24 06:40:20 +01:00
parent a5fa7e04d7
commit c0695bb473
10 changed files with 44 additions and 39 deletions

View File

@ -17,6 +17,7 @@ variables:
# Individual CI farm status, set to "offline" to disable jobs # Individual CI farm status, set to "offline" to disable jobs
# running on a particular CI farm (ie. for outages, etc): # running on a particular CI farm (ie. for outages, etc):
FD_FARM: "online" FD_FARM: "online"
COLLABORA_FARM: "online"
default: default:
before_script: before_script:

View File

@ -28,6 +28,8 @@
- results/ - results/
exclude: exclude:
- results/*.shader_cache - results/*.shader_cache
tags:
- $RUNNER_TAG
after_script: after_script:
- wget -q "https://${JOB_RESULTS_PATH}" -O- | tar -xz - wget -q "https://${JOB_RESULTS_PATH}" -O- | tar -xz

View File

@ -150,6 +150,8 @@
rules: rules:
- if: '$FD_FARM == "offline"' - if: '$FD_FARM == "offline"'
when: never when: never
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
@ -177,6 +179,8 @@
rules: rules:
- if: '$FD_FARM == "offline"' - if: '$FD_FARM == "offline"'
when: never when: never
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
# If the triggerer has access to the restricted traces and if it is pre-merge # If the triggerer has access to the restricted traces and if it is pre-merge
- if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu)$/") && - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu)$/") &&
($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)' ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
@ -203,6 +207,8 @@
rules: rules:
- if: '$FD_FARM == "offline"' - if: '$FD_FARM == "offline"'
when: never when: never
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
# Run only on pre-merge pipelines from Marge # Run only on pre-merge pipelines from Marge
- if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH' - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
@ -225,6 +231,8 @@
stage: arm stage: arm
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -251,6 +259,8 @@
stage: arm stage: arm
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -346,6 +356,8 @@
stage: amd stage: amd
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -378,6 +390,8 @@
stage: amd stage: amd
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -399,6 +413,8 @@
stage: amd stage: amd
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -452,6 +468,8 @@
stage: intel stage: intel
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@ -471,6 +489,8 @@
stage: intel stage: intel
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
# Run only on pre-merge pipelines from Marge # Run only on pre-merge pipelines from Marge
- if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH' - if: '$GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH'
when: never when: never
@ -489,6 +509,8 @@
stage: intel stage: intel
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- if: '$COLLABORA_FARM == "offline" && $RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
when: never
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success

View File

@ -75,8 +75,7 @@ radv_stoney_vkcts:amd64:
HWCI_FREQ_MAX: "true" HWCI_FREQ_MAX: "true"
VK_DRIVER: radeon VK_DRIVER: radeon
DRIVER_NAME: radv DRIVER_NAME: radv
tags: RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
- mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
.radv-fossils: .radv-fossils:
extends: extends:

View File

@ -148,8 +148,7 @@ a618_vk:
DTB: sc7180-trogdor-lazor-limozeen-nots DTB: sc7180-trogdor-lazor-limozeen-nots
BOOT_METHOD: depthcharge BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: "" KERNEL_IMAGE_TYPE: ""
tags: RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
- mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
a618_vk_full: a618_vk_full:
extends: extends:

View File

@ -17,8 +17,7 @@
variables: variables:
DEVICE_TYPE: asus-C523NA-A20057-coral DEVICE_TYPE: asus-C523NA-A20057-coral
GPU_VERSION: iris-apl GPU_VERSION: iris-apl
tags: RUNNER_TAG: mesa-ci-x86-64-lava-asus-C523NA-A20057-coral
- mesa-ci-x86-64-lava-asus-C523NA-A20057-coral
# 4 boards # 4 boards
.iris-glk-test: .iris-glk-test:
@ -27,8 +26,7 @@
variables: variables:
DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus
GPU_VERSION: iris-glk GPU_VERSION: iris-glk
tags: RUNNER_TAG: mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus
- mesa-ci-x86-64-lava-hp-x360-12b-ca0010nr-n4020-octopus
# 5 boards, manual for now due to the GPU being occasionally stuck # 5 boards, manual for now due to the GPU being occasionally stuck
.iris-amly-test: .iris-amly-test:
@ -38,8 +36,7 @@
variables: variables:
DEVICE_TYPE: asus-C433TA-AJ0005-rammus DEVICE_TYPE: asus-C433TA-AJ0005-rammus
GPU_VERSION: iris-amly GPU_VERSION: iris-amly
tags: RUNNER_TAG: mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus
- mesa-ci-x86-64-lava-asus-C433TA-AJ0005-rammus
# 7 boards # 7 boards
.iris-kbl-test: .iris-kbl-test:
@ -48,8 +45,7 @@
variables: variables:
DEVICE_TYPE: hp-x360-14-G1-sona DEVICE_TYPE: hp-x360-14-G1-sona
GPU_VERSION: iris-kbl GPU_VERSION: iris-kbl
tags: RUNNER_TAG: mesa-ci-x86-64-lava-hp-x360-14-G1-sona
- mesa-ci-x86-64-lava-hp-x360-14-G1-sona
# 5 boards # 5 boards
.iris-whl-test: .iris-whl-test:
@ -58,8 +54,7 @@
variables: variables:
DEVICE_TYPE: dell-latitude-5400-8665U-sarien DEVICE_TYPE: dell-latitude-5400-8665U-sarien
GPU_VERSION: iris-whl GPU_VERSION: iris-whl
tags: RUNNER_TAG: mesa-ci-x86-64-lava-dell-latitude-5400-8665U-sarien
- mesa-ci-x86-64-lava-dell-latitude-5400-8665U-sarien
# 5 boards # 5 boards
.iris-cml-test: .iris-cml-test:
@ -68,8 +63,7 @@
variables: variables:
DEVICE_TYPE: asus-C436FA-Flip-hatch DEVICE_TYPE: asus-C436FA-Flip-hatch
GPU_VERSION: iris-cml GPU_VERSION: iris-cml
tags: RUNNER_TAG: mesa-ci-x86-64-lava-asus-C436FA-flip-hatch
- mesa-ci-x86-64-lava-asus-C436FA-flip-hatch
iris-apl-deqp: iris-apl-deqp:
extends: extends:

View File

@ -10,6 +10,4 @@
FDO_CI_CONCURRENT: 4 FDO_CI_CONCURRENT: 4
DEQP_EXPECTED_RENDERER: Mali450 DEQP_EXPECTED_RENDERER: Mali450
VISIBILITY_GROUP: "mesa-ci" VISIBILITY_GROUP: "mesa-ci"
RUNNER_TAG: mesa-ci-x86-64-lava-lima
tags:
- mesa-ci-x86-64-lava-lima

View File

@ -12,8 +12,7 @@
FDO_CI_CONCURRENT: 4 FDO_CI_CONCURRENT: 4
DEQP_EXPECTED_RENDERER: STONEY DEQP_EXPECTED_RENDERER: STONEY
HWCI_FREQ_MAX: "true" HWCI_FREQ_MAX: "true"
tags: RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
- mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
radeonsi-stoney-gl:amd64: radeonsi-stoney-gl:amd64:
extends: extends:
@ -31,8 +30,7 @@ radeonsi-stoney-traces:amd64:
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-radeonsi.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
tags: RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
- mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
radeonsi-stoney-piglit-gl:amd64: radeonsi-stoney-piglit-gl:amd64:
extends: extends:

View File

@ -18,8 +18,7 @@
DEVICE_TYPE: asus-cx9400-volteer DEVICE_TYPE: asus-cx9400-volteer
GPU_VERSION: anv-tgl GPU_VERSION: anv-tgl
FDO_CI_CONCURRENT: 8 FDO_CI_CONCURRENT: 8
tags: RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer
- mesa-ci-x86-64-lava-asus-cx9400-volteer
anv-tgl-vk: anv-tgl-vk:
extends: extends:

View File

@ -15,8 +15,7 @@ panfrost-t720-gles2:arm64:
GPU_VERSION: panfrost-t720 GPU_VERSION: panfrost-t720
DEQP_SUITE: panfrost-t720 DEQP_SUITE: panfrost-t720
FDO_CI_CONCURRENT: 6 FDO_CI_CONCURRENT: 6
tags: RUNNER_TAG: mesa-ci-x86-64-lava-sun50i-h6-pine-h64
- mesa-ci-x86-64-lava-sun50i-h6-pine-h64
panfrost-t760-gles2:armhf: panfrost-t760-gles2:armhf:
extends: extends:
@ -31,8 +30,7 @@ panfrost-t760-gles2:armhf:
KERNEL_IMAGE_TYPE: "" KERNEL_IMAGE_TYPE: ""
DEQP_SUITE: panfrost-t760 DEQP_SUITE: panfrost-t760
FDO_CI_CONCURRENT: 6 FDO_CI_CONCURRENT: 6
tags: RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
- mesa-ci-x86-64-lava-rk3288-veyron-jaq
panfrost-t760-traces:armhf: panfrost-t760-traces:armhf:
extends: extends:
@ -53,8 +51,7 @@ panfrost-t760-traces:armhf:
EGL_PLATFORM: surfaceless EGL_PLATFORM: surfaceless
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image" PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image"
tags: RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
- mesa-ci-x86-64-lava-rk3288-veyron-jaq
.lava-rk3399-gru-kevin: .lava-rk3399-gru-kevin:
extends: extends:
@ -67,8 +64,7 @@ panfrost-t760-traces:armhf:
DRIVER_NAME: panfrost DRIVER_NAME: panfrost
BOOT_METHOD: depthcharge BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: "" KERNEL_IMAGE_TYPE: ""
tags: RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin
- mesa-ci-x86-64-lava-rk3399-gru-kevin
panfrost-t860-gl:arm64: panfrost-t860-gl:arm64:
parallel: 3 parallel: 3
@ -100,8 +96,7 @@ panfrost-t860-traces:arm64:
DEVICE_TYPE: meson-g12b-a311d-khadas-vim3 DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
DTB: $DEVICE_TYPE DTB: $DEVICE_TYPE
GPU_VERSION: panfrost-g52 GPU_VERSION: panfrost-g52
tags: RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
- mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
panfrost-g52-gl:arm64: panfrost-g52-gl:arm64:
parallel: 3 parallel: 3
@ -144,8 +139,7 @@ panfrost-g52-piglit-gl:arm64:
BOOT_METHOD: depthcharge BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: "" KERNEL_IMAGE_TYPE: ""
GPU_VERSION: panfrost-g72 GPU_VERSION: panfrost-g72
tags: RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
- mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
panfrost-g72-gl:arm64: panfrost-g72-gl:arm64:
parallel: 3 parallel: 3
@ -166,5 +160,4 @@ panfrost-g72-gl:arm64:
GPU_VERSION: panfrost-t820 GPU_VERSION: panfrost-t820
FDO_CI_CONCURRENT: 6 FDO_CI_CONCURRENT: 6
DEQP_SUITE: panfrost-t720 DEQP_SUITE: panfrost-t720
tags: RUNNER_TAG: mesa-ci-aarch64-lava-baylibre
- mesa-ci-aarch64-lava-baylibre