ci: split the cts jobs in two

Signed-off-by: Elie Tournier <elie.tournier@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-By: Gert Wollny <gert.wollny@collabora.com>

ci/.gitlab-ci.yml

@@ -141,7 +141,7 @@ piglit - gles host:
     paths:
       - results/
 
-cts - gl host:
+cts gl - gl host:
   stage: test
   services:
     - docker:dind
@@ -160,7 +160,7 @@ cts - gl host:
              $RD_CONFIG
              -v $PWD:/virglrenderer
              $CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST
-             bash -c "/virglrenderer/ci/run_tests.sh --deqp-gl"
+             bash -c "/virglrenderer/ci/run_tests.sh --deqp-gl-gl-tests"
              2>&1 | tee results/docker_test_log.txt
     - echo "\n\n"
   only:
@@ -172,7 +172,7 @@ cts - gl host:
     paths:
       - results/
 
-cts - gles host:
+cts gles - gl host:
   stage: test
   services:
     - docker:dind
@@ -191,7 +191,69 @@ cts - gles host:
              $RD_CONFIG
              -v $PWD:/virglrenderer
              $CI_REGISTRY_IMAGE@$DOCKER_IMAGE_DIGEST
-             bash -c "/virglrenderer/ci/run_tests.sh --deqp-gles"
+             bash -c "/virglrenderer/ci/run_tests.sh --deqp-gl-gles-tests"
+             2>&1 | tee results/docker_test_log.txt
+    - echo "\n\n"
+  only:
+    - merge_requests
+    - schedules
+
+  artifacts:
+    when: always
+    paths:
+      - results/
+
+cts gl - gles host:
+  stage: test
+  services:
+    - docker:dind
+  before_script:
+    - mkdir -p ccache
+    - mkdir -p results
+    - export DOCKER_IMAGE_DIGEST=$(cat results/docker_image_digest.txt)
+    - echo $DOCKER_IMAGE_DIGEST
+  script:
+    - echo core > /proc/sys/kernel/core_pattern || true
+    - echo 0 > /proc/sys/kernel/core_uses_pid || true
+    - if [[ -n "$RENDER_DEVICE" ]]; then RD_CONFIG="--device=$RENDER_DEVICE -e RENDER_DEVICE=$RENDER_DEVICE"; fi
+    - echo RD_CONFIG=$RD_CONFIG
+    - 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"
+             2>&1 | tee results/docker_test_log.txt
+    - echo "\n\n"
+  only:
+    - merge_requests
+    - schedules
+
+  artifacts:
+    when: always
+    paths:
+      - results/
+
+cts gles - gles host:
+  stage: test
+  services:
+    - docker:dind
+  before_script:
+    - mkdir -p ccache
+    - mkdir -p results
+    - export DOCKER_IMAGE_DIGEST=$(cat results/docker_image_digest.txt)
+    - echo $DOCKER_IMAGE_DIGEST
+  script:
+    - echo core > /proc/sys/kernel/core_pattern || true
+    - echo 0 > /proc/sys/kernel/core_uses_pid || true
+    - if [[ -n "$RENDER_DEVICE" ]]; then RD_CONFIG="--device=$RENDER_DEVICE -e RENDER_DEVICE=$RENDER_DEVICE"; fi
+    - echo RD_CONFIG=$RD_CONFIG
+    - 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"
              2>&1 | tee results/docker_test_log.txt
     - echo "\n\n"
   only:

ci/run_tests.sh

@@ -69,17 +69,26 @@ run_deqp()
 {
    UNRELIABLE="$1"
    OGL_BACKEND="$2"
+   SUITE="$3"
 
    if [ $UNRELIABLE -eq 1 ]; then
       TEST_UNRELIABLE="--unreliable"
    fi
 
+   if [ "$SUITE" = "gl" ]; then
+      TEST_SUITE="--gl30 --gl31 --gl32"
+   fi
+
+   if [ "$SUITE" = "gles" ]; then
+      TEST_SUITE="--gles2 --gles3 --gles31"
+   fi
+
    BACKENDS="--backend vtest-softpipe"
    if [[ -z "$SOFTWARE_ONLY" ]]; then
       BACKENDS="${BACKENDS} --backend vtest-gpu"
    fi
 
-   ./run_test_suite.sh --deqp --gles2 --gles3 --gles31 --gl30 --gl31 --gl32 \
+   ./run_test_suite.sh --deqp ${TEST_SUITE} \
       --host-${OGL_BACKEND} \
       ${TEST_UNRELIABLE} \
       ${BACKENDS} \
@@ -127,16 +136,24 @@ parse_input()
          UNRELIABLE=1
          ;& #Fallthrough
 
-         --deqp-gl)
+         --deqp-gl-gl-tests)
-         run_deqp $UNRELIABLE gl
+         run_deqp $UNRELIABLE gl gl
+         ;;
+
+         --deqp-gl-gles-tests)
+         run_deqp $UNRELIABLE gl gles
          ;;
 
          --deqp-gles-unreliable)
          UNRELIABLE=1
          ;& #Fallthrough
 
-         --deqp-gles)
+         --deqp-gles-gl-tests)
-         run_deqp $UNRELIABLE gles
+         run_deqp $UNRELIABLE gles gl
+         ;;
+
+         --deqp-gles-gles-tests)
+         run_deqp $UNRELIABLE gles gles
          ;;
 
          --piglit-gl-unreliable)