Commit 957a5d99 authored by Tomeu Vizoso's avatar Tomeu Vizoso

ci: Upload dEQP results from LAVA to MinIO

Upload them and stash into job artifacts.
Signed-off-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
parent 10fbd59e
......@@ -408,7 +408,7 @@ arm64_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &arm64_test "2020-12-23-piglit-2"
MESA_IMAGE_TAG: &arm64_test "2021-01-04-lava-deqp-uploads"
.use-arm64_test:
variables:
......@@ -422,7 +422,7 @@ armhf_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &armhf_test "2020-12-23-piglit-2"
MESA_IMAGE_TAG: &armhf_test "2021-01-04-lava-deqp-uploads"
.use-armhf_test:
variables:
......
......@@ -94,7 +94,6 @@ actions:
- wget -S --progress=dot:giga -O- {{ mesa_url }} | tar -xz
- export DEQP_NO_SAVE_RESULTS=1
- export GPU_VERSION={{ gpu_version }}
- export DEQP_VER={{ deqp_version }}
- export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri
......@@ -104,6 +103,11 @@ actions:
else
echo 'deqp: fail';
fi"
- find /results/ -type f -size +0c -name \*.csv -exec python3 /install/minio_uploads.py {} \;
- find /results/ -type f -size +0c -name \*.xml -exec python3 /install/minio_uploads.py {} \;
- find /results/ -type f -size +0c -name \*.xsl -exec python3 /install/minio_uploads.py {} \;
- find /results/ -type f -size +0c -name \*.css -exec python3 /install/minio_uploads.py {} \;
parse:
pattern: '(?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
from: inline
......
variables:
DISTRIBUTION_TAG: "2020-12-23-piglit"
DISTRIBUTION_TAG: "2021-01-04-lava-deqp-uploads"
.kernel+rootfs:
stage: container-2
......@@ -46,7 +46,7 @@ kernel+rootfs_armhf:
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
ENV_VARS: "DEQP_PARALLEL=6"
FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_JOB_JWT=${CI_JOB_JWT} CI_SERVER_URL=${CI_SERVER_URL} DRIVER_NAME=${DRIVER_NAME} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} PIGLIT_NO_WINDOW=1 PIGLIT_REPLAY_UPLOAD_TO_MINIO=1 MINIO_HOST=${MINIO_HOST}"
FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_JOB_URL=${CI_JOB_URL} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_PROJECT_NAME=${CI_PROJECT_NAME} CI_PROJECT_NAMESPACE=${CI_PROJECT_NAMESPACE} CI_JOB_JWT=${CI_JOB_JWT} CI_SERVER_URL=${CI_SERVER_URL} DRIVER_NAME=${DRIVER_NAME} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} PIGLIT_NO_WINDOW=1 PIGLIT_REPLAY_UPLOAD_TO_MINIO=1 MINIO_HOST=${MINIO_HOST}"
DEQP_VERSION: gles2
ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava/"
MESA_URL: "https://${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-${ARCH}.tar.gz"
......@@ -84,11 +84,19 @@ kernel+rootfs_armhf:
- result=`lavacli results $lava_job_id 0_${TEST_SUITE} ${TEST_SUITE} | head -1`
- echo $result
- '[[ "$result" == "pass" ]]'
after_script:
- mkdir -p results
- ci-fairy minio login $CI_JOB_JWT
- artifacts=`ci-fairy minio ls minio://minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/${CI_JOB_ID}/`
- >
for file in $artifacts; do
ci-fairy minio cp minio://minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/${CI_JOB_ID}/$file results/
done
artifacts:
name: "mesa_${CI_JOB_NAME}"
when: always
paths:
- artifacts/
- results/
.lava-test:armhf:
variables:
......
......@@ -32,6 +32,7 @@ cp -Rp .gitlab-ci/fossils install/
cp -Rp .gitlab-ci/fossilize-runner.sh install/
cp -Rp .gitlab-ci/deqp-runner.sh install/
cp -Rp .gitlab-ci/deqp-*.txt install/
cp -Rp .gitlab-ci/minio_uploads.py install/
# Tar up the install dir so that symlinks and hardlinks aren't each
# packed separately in the zip file.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment