gitlab-ci: add a gl suffix to the x86 test image and all test jobs
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
parent
7e0ab6aae0
commit
520a77d486
|
@ -105,11 +105,11 @@ x86_build:
|
||||||
needs:
|
needs:
|
||||||
- x86_build
|
- x86_build
|
||||||
|
|
||||||
# Debian 10 based x86 test image
|
# Debian 10 based x86 test image for GL
|
||||||
x86_test:
|
x86_test-gl:
|
||||||
extends: x86_build
|
extends: x86_build
|
||||||
variables:
|
variables:
|
||||||
DEBIAN_TAG: &x86_test "2019-12-02"
|
DEBIAN_TAG: &x86_test-gl "2019-12-05"
|
||||||
|
|
||||||
# Debian 9 based x86 build image (old LLVM)
|
# Debian 9 based x86 build image (old LLVM)
|
||||||
x86_build_old:
|
x86_build_old:
|
||||||
|
@ -453,14 +453,14 @@ scons-old-llvm:
|
||||||
script:
|
script:
|
||||||
- LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
|
- LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
|
||||||
|
|
||||||
.test:
|
.test-gl:
|
||||||
extends:
|
extends:
|
||||||
- .ci-run-policy
|
- .ci-run-policy
|
||||||
stage: test
|
stage: test
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none # testing doesn't build anything from source
|
GIT_STRATEGY: none # testing doesn't build anything from source
|
||||||
TAG: *x86_test
|
TAG: *x86_test-gl
|
||||||
image: "$CI_REGISTRY_IMAGE/debian/x86_test:$TAG"
|
image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG"
|
||||||
before_script:
|
before_script:
|
||||||
# Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
|
# Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
|
||||||
- rm -rf install
|
- rm -rf install
|
||||||
|
@ -475,10 +475,10 @@ scons-old-llvm:
|
||||||
- meson-testing
|
- meson-testing
|
||||||
needs:
|
needs:
|
||||||
- meson-testing
|
- meson-testing
|
||||||
- x86_test
|
- x86_test-gl
|
||||||
|
|
||||||
.piglit-test:
|
.piglit-test:
|
||||||
extends: .test
|
extends: .test-gl
|
||||||
artifacts:
|
artifacts:
|
||||||
when: on_failure
|
when: on_failure
|
||||||
name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
|
name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
|
||||||
|
@ -524,8 +524,8 @@ piglit-quick_shader:
|
||||||
-x spec@glsl-1.50@execution@built-in-functions
|
-x spec@glsl-1.50@execution@built-in-functions
|
||||||
PIGLIT_PROFILES: quick_shader
|
PIGLIT_PROFILES: quick_shader
|
||||||
|
|
||||||
.deqp-test:
|
.deqp-test-gl:
|
||||||
extends: .test
|
extends: .test-gl
|
||||||
variables:
|
variables:
|
||||||
DEQP_SKIPS: deqp-default-skips.txt
|
DEQP_SKIPS: deqp-default-skips.txt
|
||||||
script:
|
script:
|
||||||
|
@ -540,7 +540,7 @@ test-llvmpipe-gles2:
|
||||||
LP_NUM_THREADS: 0
|
LP_NUM_THREADS: 0
|
||||||
DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
|
DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
|
||||||
LIBGL_ALWAYS_SOFTWARE: "true"
|
LIBGL_ALWAYS_SOFTWARE: "true"
|
||||||
extends: .deqp-test
|
extends: .deqp-test-gl
|
||||||
|
|
||||||
test-softpipe-gles2:
|
test-softpipe-gles2:
|
||||||
extends: test-llvmpipe-gles2
|
extends: test-llvmpipe-gles2
|
||||||
|
@ -563,7 +563,7 @@ test-softpipe-gles31:
|
||||||
|
|
||||||
arm64_a630_gles2:
|
arm64_a630_gles2:
|
||||||
extends:
|
extends:
|
||||||
- .deqp-test
|
- .deqp-test-gl
|
||||||
- .use-arm_test
|
- .use-arm_test
|
||||||
variables:
|
variables:
|
||||||
DEQP_VER: gles2
|
DEQP_VER: gles2
|
||||||
|
|
Loading…
Reference in New Issue