Revert "ci: disable all a306/a530/a630 jobs"

This reverts commit af214c233b.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22780>
This commit is contained in:
Rob Clark
2023-05-01 07:34:13 -07:00
committed by Marge Bot
parent 98bb47ee45
commit cdf01be131
2 changed files with 20 additions and 20 deletions

View File

@@ -40,7 +40,7 @@
BM_DTB: /baremetal-files/apq8016-sbc.dtb BM_DTB: /baremetal-files/apq8016-sbc.dtb
GPU_VERSION: freedreno-a307 GPU_VERSION: freedreno-a307
.a306_gl: a306_gl:
extends: extends:
- .baremetal-deqp-test - .baremetal-deqp-test
- .a306-test - .a306-test
@@ -75,7 +75,7 @@ a306_piglit_shader:
PIGLIT_PROFILES: quick_shader PIGLIT_PROFILES: quick_shader
FDO_CI_CONCURRENT: 6 FDO_CI_CONCURRENT: 6
.a306-traces: a306-traces:
extends: extends:
- .google-freedreno-test-traces - .google-freedreno-test-traces
- .a306-test - .a306-test
@@ -94,7 +94,7 @@ a306_piglit_shader:
tags: tags:
- google-freedreno-db820c - google-freedreno-db820c
.a530_gl: a530_gl:
extends: extends:
- .baremetal-deqp-test - .baremetal-deqp-test
- .a530-test - .a530-test
@@ -126,7 +126,7 @@ a306_piglit_shader:
variables: variables:
PIGLIT_PROFILES: quick_gl PIGLIT_PROFILES: quick_gl
.a530-traces: a530-traces:
extends: extends:
- .google-freedreno-test-traces - .google-freedreno-test-traces
- .a530-test - .a530-test
@@ -298,7 +298,7 @@ a660_gl:
tags: tags:
- google-freedreno-cheza-long - google-freedreno-cheza-long
.a630_gl: a630_gl:
extends: extends:
- .baremetal-deqp-test - .baremetal-deqp-test
- .a630-test - .a630-test
@@ -308,7 +308,7 @@ a660_gl:
# Run dEQP EGL window system tests separately with the window systems available. # Run dEQP EGL window system tests separately with the window systems available.
# X11 takes over the screen, wayland is run headless. # X11 takes over the screen, wayland is run headless.
.a630_egl: a630_egl:
extends: extends:
- .baremetal-deqp-test - .baremetal-deqp-test
- .a630-test - .a630-test
@@ -318,7 +318,7 @@ a660_gl:
HWCI_START_WESTON: 1 HWCI_START_WESTON: 1
DEQP_SUITE: freedreno-a630-egl DEQP_SUITE: freedreno-a630-egl
.a630_gles_asan: a630_gles_asan:
extends: extends:
- .baremetal-deqp-test - .baremetal-deqp-test
- .a630-test - .a630-test
@@ -330,7 +330,7 @@ a660_gl:
FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
GPU_VERSION: freedreno-a630-asan GPU_VERSION: freedreno-a630-asan
.a630_skqp: a630_skqp:
extends: extends:
- .baremetal-deqp-test - .baremetal-deqp-test
- .a630-test - .a630-test
@@ -340,7 +340,7 @@ a660_gl:
HWCI_START_XORG: 1 HWCI_START_XORG: 1
DEQP_SUITE: freedreno-a630-skqp DEQP_SUITE: freedreno-a630-skqp
.a630_vk: a630_vk:
extends: extends:
- .a630-test - .a630-test
- .baremetal-deqp-test-freedreno-vk - .baremetal-deqp-test-freedreno-vk
@@ -348,14 +348,14 @@ a660_gl:
variables: variables:
DEQP_SUITE: freedreno-a630-vk DEQP_SUITE: freedreno-a630-vk
.a630_vk_full: a630_vk_full:
# We use a longer timeout (3 hour job) to keep the parallel down so that we # We use a longer timeout (3 hour job) to keep the parallel down so that we
# don't lock up too many runners for a long time when a dev is testing full VK # don't lock up too many runners for a long time when a dev is testing full VK
# status. The full runs are restricted to just 2 runners to keep from # status. The full runs are restricted to just 2 runners to keep from
# blocking up normal merges, so going more parallel doesn't make any sense. # blocking up normal merges, so going more parallel doesn't make any sense.
timeout: 3h timeout: 3h
extends: extends:
- .a630_vk - a630_vk
- .a630-full - .a630-full
- .turnip-manual-rules - .turnip-manual-rules
parallel: 2 parallel: 2
@@ -363,7 +363,7 @@ a660_gl:
DEQP_SUITE: freedreno-a630-vk-full DEQP_SUITE: freedreno-a630-vk-full
TEST_PHASE_TIMEOUT: 180 TEST_PHASE_TIMEOUT: 180
.a630_vk_asan: a630_vk_asan:
extends: extends:
- .a630-test - .a630-test
- .baremetal-deqp-test-freedreno-vk - .baremetal-deqp-test-freedreno-vk
@@ -374,7 +374,7 @@ a660_gl:
FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
GPU_VERSION: freedreno-a630-asan GPU_VERSION: freedreno-a630-asan
.a630_piglit: a630_piglit:
extends: extends:
- .baremetal-deqp-test - .baremetal-deqp-test
- .a630-test - .a630-test
@@ -384,7 +384,7 @@ a660_gl:
HWCI_START_XORG: 1 HWCI_START_XORG: 1
DEQP_SUITE: freedreno-a630-piglit DEQP_SUITE: freedreno-a630-piglit
.a630-traces: a630-traces:
extends: extends:
- .google-freedreno-test-traces - .google-freedreno-test-traces
- .a630-test - .a630-test
@@ -397,18 +397,18 @@ a660_gl:
MESA_GL_VERSION_OVERRIDE: "4.6" MESA_GL_VERSION_OVERRIDE: "4.6"
PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri=" PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri="
.a630-traces-restricted: a630-traces-restricted:
extends: extends:
- .a630-traces - a630-traces
- .freedreno-rules-restricted - .freedreno-rules-restricted
variables: variables:
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/restricted-traces-freedreno.yml" PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/restricted-traces-freedreno.yml"
PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}" PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}"
allow_failure: true allow_failure: true
.a630-traces-performance: a630-traces-performance:
extends: extends:
- .a630-traces - a630-traces
- .freedreno-rules-performance - .freedreno-rules-performance
variables: variables:
PIGLIT_REPLAY_SUBCOMMAND: "profile" PIGLIT_REPLAY_SUBCOMMAND: "profile"

View File

@@ -137,9 +137,9 @@ zink-tu-a618-traces-performance:
# a618 tag starts with cbg-1 (not cbg-0) for some reason # a618 tag starts with cbg-1 (not cbg-0) for some reason
LAVA_TAGS: "cbg-1" LAVA_TAGS: "cbg-1"
.zink-freedreno-a630-traces: zink-freedreno-a630-traces:
extends: extends:
- .a630-traces - a630-traces
- .zink-turnip-rules - .zink-turnip-rules
- .zink-trace-test - .zink-trace-test
variables: variables: