From cd3b6689b2ef6018ad3bb635eb91d08836f10cc1 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 22 Jul 2021 12:51:41 -0700 Subject: [PATCH] ci: Save dEQP results on all tests. Everyone can get artifacts now. Let's make those artifacts useful. Acked-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci/common/generate-env.sh | 1 - .gitlab-ci/deqp-runner.sh | 5 ----- .gitlab-ci/lava/lava-gitlab-ci.yml | 1 - src/gallium/drivers/virgl/ci/gitlab-ci.yml | 2 -- 4 files changed, 9 deletions(-) diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index a76e2b24a0b..18e11b775bc 100755 --- a/.gitlab-ci/common/generate-env.sh +++ b/.gitlab-ci/common/generate-env.sh @@ -26,7 +26,6 @@ for var in \ DEQP_EXPECTED_RENDERER \ DEQP_FRACTION \ DEQP_HEIGHT \ - DEQP_NO_SAVE_RESULTS \ DEQP_PARALLEL \ DEQP_RESULTS_DIR \ DEQP_RUNNER_OPTIONS \ diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index cc4a539e2b3..cdc089501aa 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -115,11 +115,6 @@ else JOB="--jobs 4" fi -# If this CI lab lacks artifacts support, print the whole list of failures/flakes. -if [ -n "$DEQP_NO_SAVE_RESULTS" ]; then - SUMMARY_LIMIT="--summary-limit 0" -fi - parse_renderer() { RENDERER=`grep -A1 TestCaseResult.\*info.renderer $RESULTS/deqp-info.qpa | grep '||g' | sed 's|||g'` VERSION=`grep -A1 TestCaseResult.\*info.version $RESULTS/deqp-info.qpa | grep '||g' | sed 's|||g'` diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 7f7b389854f..eb58978b7cf 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -6,7 +6,6 @@ variables: GIT_STRATEGY: none # testing doesn't build anything from source DEQP_PARALLEL: 6 # should be replaced by per-machine definitions - DEQP_NO_SAVE_RESULTS: 1 # but why not ... ? DEQP_VER: gles2 # proxy used to cache data locally FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri=" diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index 3898c28dac2..8d5c60a0b83 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -10,12 +10,10 @@ virgl-gles2-on-gl: variables: DEQP_VER: gles2 - DEQP_NO_SAVE_RESULTS: 1 GPU_VERSION: virgl-gl # Don't use threads inside llvmpipe, we've already got all cores # busy at the deqp-runner level. LP_NUM_THREADS: 0 - DEQP_OPTIONS: "--deqp-log-images=disable" DEQP_EXPECTED_RENDERER: virgl CROSVM_TEST_SCRIPT: "/install/deqp-runner.sh" tags: