ci: create a "generic" runtime test and use it

Currently we have the exact same code for all the runtime tests. A
simple solution is to write a "generic" one and extend upon it.

This minimises the boilerplate, prevents issues like ones addressed with
earlier patch.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Elie Tournier <elie.tournier@collabora.com>
macos/master
Emil Velikov 6 years ago committed by Gert Wollny
parent 0d7e39891a
commit c52a216636
  1. 129
      ci/.gitlab-ci.yml

@ -85,7 +85,7 @@ make check:
paths: paths:
- results/ - results/
piglit - gl host: .tests:
stage: test stage: test
services: services:
- docker:dind - docker:dind
@ -97,7 +97,7 @@ piglit - gl host:
$RD_CONFIG $RD_CONFIG
-v $PWD:/virglrenderer -v $PWD:/virglrenderer
$CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST $CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST
bash -c "/virglrenderer/ci/run_tests.sh --piglit-gl" bash -c "/virglrenderer/ci/run_tests.sh $TEST_SUITE"
- echo "\n\n" - echo "\n\n"
only: only:
- merge_requests - merge_requests
@ -108,117 +108,32 @@ piglit - gl host:
paths: paths:
- results/ - results/
piglit - gles host: piglit - gl host:
stage: test variables:
services: TEST_SUITE: '--piglit-gl'
- docker:dind extends: .tests
before_script:
*docker-setup
script:
- docker run
--ulimit core=99999999999:99999999999
$RD_CONFIG
-v $PWD:/virglrenderer
$CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST
bash -c "/virglrenderer/ci/run_tests.sh --piglit-gles"
- echo "\n\n"
only:
- merge_requests
- schedules
artifacts: piglit - gles host:
when: always variables:
paths: TEST_SUITE: '--piglit-gles'
- results/ extends: .tests
cts gl - gl host: cts gl - gl host:
stage: test variables:
services: TEST_SUITE: '--deqp-gl-gl-tests'
- docker:dind extends: .tests
before_script:
*docker-setup
script:
- docker run
--ulimit core=99999999999:99999999999
$RD_CONFIG
-v $PWD:/virglrenderer
$CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST
bash -c "/virglrenderer/ci/run_tests.sh --deqp-gl-gl-tests"
- echo "\n\n"
only:
- merge_requests
- schedules
artifacts:
when: always
paths:
- results/
cts gles - gl host: cts gles - gl host:
stage: test variables:
services: TEST_SUITE: '--deqp-gl-gles-tests'
- docker:dind extends: .tests
before_script:
*docker-setup
script:
- docker run
--ulimit core=99999999999:99999999999
$RD_CONFIG
-v $PWD:/virglrenderer
$CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST
bash -c "/virglrenderer/ci/run_tests.sh --deqp-gl-gles-tests"
- echo "\n\n"
only:
- merge_requests
- schedules
artifacts:
when: always
paths:
- results/
cts gl - gles host: cts gl - gles host:
stage: test variables:
services: TEST_SUITE: '--deqp-gles-gl-tests'
- docker:dind extends: .tests
before_script:
*docker-setup
script:
- docker run
--ulimit core=99999999999:99999999999
$RD_CONFIG
-v $PWD:/virglrenderer
$CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST
bash -c "/virglrenderer/ci/run_tests.sh --deqp-gles-gl-tests"
- echo "\n\n"
only:
- merge_requests
- schedules
artifacts:
when: always
paths:
- results/
cts gles - gles host: cts gles - gles host:
stage: test variables:
services: TEST_SUITE: '--deqp-gles-gles-tests'
- docker:dind extends: .tests
before_script:
*docker-setup
script:
- docker run
--ulimit core=99999999999:99999999999
$RD_CONFIG
-v $PWD:/virglrenderer
$CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST
bash -c "/virglrenderer/ci/run_tests.sh --deqp-gles-gles-tests"
- echo "\n\n"
only:
- merge_requests
- schedules
artifacts:
when: always
paths:
- results/

Loading…
Cancel
Save