From c52a2166366281794bb93fee61c4343f6571d28b Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 9 May 2019 18:05:23 +0100
Subject: [PATCH] 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>
---
 ci/.gitlab-ci.yml | 129 ++++++++--------------------------------------
 1 file changed, 22 insertions(+), 107 deletions(-)

diff --git a/ci/.gitlab-ci.yml b/ci/.gitlab-ci.yml
index f018500..82dffff 100644
--- a/ci/.gitlab-ci.yml
+++ b/ci/.gitlab-ci.yml
@@ -85,7 +85,7 @@ make check:
     paths:
       - results/
 
-piglit - gl host:
+.tests:
   stage: test
   services:
     - docker:dind
@@ -97,7 +97,7 @@ piglit - gl host:
              $RD_CONFIG
              -v $PWD:/virglrenderer
              $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"
   only:
     - merge_requests
@@ -108,117 +108,32 @@ piglit - gl host:
     paths:
       - results/
 
-piglit - gles host:
-  stage: test
-  services:
-    - docker:dind
-  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
+piglit - gl host:
+  variables:
+    TEST_SUITE: '--piglit-gl'
+  extends: .tests
 
-  artifacts:
-    when: always
-    paths:
-      - results/
+piglit - gles host:
+  variables:
+    TEST_SUITE: '--piglit-gles'
+  extends: .tests
 
 cts gl - gl host:
-  stage: test
-  services:
-    - docker:dind
-  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/
+  variables:
+    TEST_SUITE: '--deqp-gl-gl-tests'
+  extends: .tests
 
 cts gles - gl host:
-  stage: test
-  services:
-    - docker:dind
-  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/
+  variables:
+    TEST_SUITE: '--deqp-gl-gles-tests'
+  extends: .tests
 
 cts gl - gles host:
-  stage: test
-  services:
-    - docker:dind
-  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/
+  variables:
+    TEST_SUITE: '--deqp-gles-gl-tests'
+  extends: .tests
 
 cts gles - gles host:
-  stage: test
-  services:
-    - docker:dind
-  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/
+  variables:
+    TEST_SUITE: '--deqp-gles-gles-tests'
+  extends: .tests