diff options
| author | Neil Armstrong <[email protected]> | 2020-03-25 17:06:18 +0100 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-13 21:46:40 +0000 |
| commit | 7f2539dcc08347e697c3dbbeec59b33d7624fb89 (patch) | |
| tree | 331a3e398af711d3f5ea44b4b688fc2ae9702b5a /.gitlab-ci | |
| parent | b637994b2cc6fb4e6860c32f46cbd6847f8d5bb4 (diff) | |
gitlab-ci: re-enable mali400/450 and t820 jobs
The FILES_HOST_NAME and FILES_HOST_URL are in the baylibre's runner
environment to make it more flexible.
Also use the new aarch64 mesa-ci-aarch64-lava-baylibre runner with
embedded nginx server to serve the LAVA artifacts.
Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Tomeu Vizoso <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4295>
(cherry picked from commit 51831537a2af75adc7d1611e4a7d6b02706eb32b)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4462>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 1f162bd83bb..a1affb61376 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -107,16 +107,16 @@ panfrost-t860-test:arm64: tags: - mesa-ci-aarch64-lava-collabora -.panfrost-t820-test:arm64: +panfrost-t820-gles2:arm64: extends: .lava-test:arm64 variables: DEVICE_TYPE: meson-gxm-khadas-vim2 GPU_VERSION: panfrost-t820 LAVA_TAGS: panfrost tags: - - lava-meson-gxm-khadas-vim2 + - mesa-ci-aarch64-lava-baylibre -.lima-mali400-test:armhf: +lima-mali400-test:armhf: parallel: 2 extends: .lava-test:armhf variables: @@ -124,13 +124,13 @@ panfrost-t860-test:arm64: GPU_VERSION: lima ENV_VARS: "DEQP_PARALLEL=3" tags: - - lava-sun8i-h3-libretech-all-h3-cc + - mesa-ci-aarch64-lava-baylibre -.lima-mali450-test:arm64: +lima-mali450-test:arm64: extends: .lava-test:arm64 variables: DEVICE_TYPE: meson-gxl-s905x-libretech-cc GPU_VERSION: lima ENV_VARS: "DEQP_PARALLEL=6" tags: - - lava-meson-gxl-s905x-libretech-cc + - mesa-ci-aarch64-lava-baylibre |