Module: Mesa Branch: master Commit: dcb8f625543ebcfe65a2ff55ecf75ee89724128e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dcb8f625543ebcfe65a2ff55ecf75ee89724128e
Author: Andres Gomez <[email protected]> Date: Thu Aug 27 22:18:00 2020 +0300 ci: add piglit jobs to LAVA and remove tracie ones v2: - Squashed the commit to remove tracie jobs (Eric). v3: - Rename *-piglit-traces jobs with *-traces. Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Tomeu Vizoso <[email protected]> [v2] Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388> --- .gitlab-ci/lava-gitlab-ci.yml | 30 ++++++++++++---------- ...va-tracie.yml.jinja2 => lava-piglit.yml.jinja2} | 25 ++++++++++-------- .gitlab-ci/piglit/panfrost-t760-replay.txt | 16 ++++++++++++ .gitlab-ci/piglit/panfrost-t860-replay.txt | 16 ++++++++++++ .gitlab-ci/piglit/radeonsi-stoney-replay.txt | 16 ++++++++++++ .gitlab-ci/prepare-artifacts.sh | 3 +-- 6 files changed, 80 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 31b4f5a9b0a..0d7a76582c4 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -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} TRACIE_NO_UNIT_TESTS=1 TRACIE_UPLOAD_TO_MINIO=1 DRIVER_NAME=${DRIVER_NAME}" + 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}" 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"; @@ -143,25 +143,26 @@ kernel+rootfs_armhf: reports: junit: artifacts/junit.xml -.lava-traces:amd64: +.lava-piglit: variables: - TEST_SUITE: "tracie" + TEST_SUITE: "piglit" + +.lava-piglit-traces:amd64: extends: - .lava-test:amd64 + - .lava-piglit - .lava-traces-base -.lava-traces:armhf: - variables: - TEST_SUITE: "tracie" +.lava-piglit-traces:armhf: extends: - .lava-test:armhf + - .lava-piglit - .lava-traces-base -.lava-traces:arm64: - variables: - TEST_SUITE: "tracie" +.lava-piglit-traces:arm64: extends: - .lava-test:arm64 + - .lava-piglit - .lava-traces-base panfrost-t720-gles2:arm64: @@ -192,7 +193,7 @@ panfrost-t720-gles2:arm64: .panfrost-t760-traces:armhf: extends: - - .lava-traces:armhf + - .lava-piglit-traces:armhf - .panfrost-rules variables: DEVICE_TYPE: rk3288-veyron-jaq @@ -201,7 +202,7 @@ panfrost-t720-gles2:arm64: DRIVER_NAME: panfrost BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" - ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330" + ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" tags: - mesa-ci-aarch64-lava-collabora @@ -236,10 +237,10 @@ panfrost-t860-gles3:arm64: panfrost-t860-traces:arm64: extends: - - .lava-traces:arm64 + - .lava-piglit-traces:arm64 - .lava-rk3399-gru-kevin variables: - ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330" + ENV_VARS: "PAN_MESA_DEBUG=deqp MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" panfrost-g52-gles2:arm64: extends: @@ -327,7 +328,7 @@ radeonsi-stoney-gles31:amd64: radeonsi-stoney-traces:amd64: extends: - - .lava-traces:amd64 + - .lava-piglit-traces:amd64 - .radeonsi-rules variables: DEVICE_TYPE: hp-11A-G6-EE-grunt @@ -336,5 +337,6 @@ radeonsi-stoney-traces:amd64: DRIVER_NAME: radeonsi BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" + ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_HTML_SUMMARY=0 PIGLIT_JUNIT_RESULTS=1" tags: - mesa-ci-aarch64-lava-collabora diff --git a/.gitlab-ci/lava-tracie.yml.jinja2 b/.gitlab-ci/lava-piglit.yml.jinja2 similarity index 72% rename from .gitlab-ci/lava-tracie.yml.jinja2 rename to .gitlab-ci/lava-piglit.yml.jinja2 index 3d546c24d4d..cc5bc5b88ff 100644 --- a/.gitlab-ci/lava-tracie.yml.jinja2 +++ b/.gitlab-ci/lava-piglit.yml.jinja2 @@ -1,4 +1,4 @@ -job_name: mesa-tracie-{{ gpu_version }} {{ pipeline_info }} +job_name: mesa-piglit-{{ gpu_version }} {{ pipeline_info }} device_type: {{ device_type }} context: extra_nfsroot_args: " init=/init rootwait" @@ -61,8 +61,8 @@ actions: - repository: metadata: format: Lava-Test Test Definition 1.0 - name: tracie - description: "Mesa tracie test plan" + name: piglit + description: "Mesa piglit test plan" os: - oe scope: @@ -82,22 +82,27 @@ actions: {% if env_vars %} - export {{ env_vars }} {% endif %} - # tracie-runner.sh assumes some stuff is in pwd + # piglit/run.sh assumes some stuff is in pwd - cd / - wget -S --progress=dot:giga -O- {{ mesa_url }} | tar -xz - export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))") - export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri - - export DEVICE_NAME="gl-{{ gpu_version }}" + - export PIGLIT_REPLAY_EXTRA_ARGS="--keep-image" + - export PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL="/mesa-tracie-results/${CI_PROJECT_PATH}" + - export PIGLIT_REPLAY_ARTIFACTS_BASE_URL="/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/${CI_JOB_ID}" + - export PIGLIT_REPLAY_DESCRIPTION_FILE="/install/traces-${DRIVER_NAME}.yml" + - export PIGLIT_REPLAY_DEVICE_NAME=gl-{{ gpu_version }} + - export PIGLIT_RESULTS={{ gpu_version }}-${PIGLIT_PROFILES} - - "if sh /install/tracie-runner-gl.sh; then - echo 'tracie: pass'; + - "if sh /install/piglit/run.sh; then + echo 'piglit: pass'; else - echo 'tracie: fail'; + echo 'piglit: fail'; fi" parse: pattern: '(?P<test_case_id>\S*):\s+(?P<result>(pass|fail))' from: inline - name: tracie - path: inline/mesa-tracie.yaml + name: piglit + path: inline/mesa-piglit.yaml diff --git a/.gitlab-ci/piglit/panfrost-t760-replay.txt b/.gitlab-ci/piglit/panfrost-t760-replay.txt new file mode 100644 index 00000000000..ed3d20806ec --- /dev/null +++ b/.gitlab-ci/piglit/panfrost-t760-replay.txt @@ -0,0 +1,16 @@ +summary: + name: results + ---- -------- + pass: 8 + fail: 0 + crash: 0 + skip: 0 + timeout: 0 + warn: 0 + incomplete: 0 + dmesg-warn: 0 + dmesg-fail: 0 + changes: 0 + fixes: 0 +regressions: 0 + total: 8 diff --git a/.gitlab-ci/piglit/panfrost-t860-replay.txt b/.gitlab-ci/piglit/panfrost-t860-replay.txt new file mode 100644 index 00000000000..3324b2d8072 --- /dev/null +++ b/.gitlab-ci/piglit/panfrost-t860-replay.txt @@ -0,0 +1,16 @@ +summary: + name: results + ---- -------- + pass: 49 + fail: 0 + crash: 0 + skip: 0 + timeout: 0 + warn: 0 + incomplete: 0 + dmesg-warn: 0 + dmesg-fail: 0 + changes: 0 + fixes: 0 +regressions: 0 + total: 49 diff --git a/.gitlab-ci/piglit/radeonsi-stoney-replay.txt b/.gitlab-ci/piglit/radeonsi-stoney-replay.txt new file mode 100644 index 00000000000..68e13097666 --- /dev/null +++ b/.gitlab-ci/piglit/radeonsi-stoney-replay.txt @@ -0,0 +1,16 @@ +summary: + name: results + ---- -------- + pass: 58 + fail: 0 + crash: 0 + skip: 0 + timeout: 0 + warn: 0 + incomplete: 0 + dmesg-warn: 0 + dmesg-fail: 0 + changes: 0 + fixes: 0 +regressions: 0 + total: 58 diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh index 71f611a871d..06ad24092d6 100755 --- a/.gitlab-ci/prepare-artifacts.sh +++ b/.gitlab-ci/prepare-artifacts.sh @@ -44,8 +44,7 @@ tar -cf artifacts/install.tar install if [ -n "$UPLOAD_FOR_LAVA" ]; then # Pass needed files to the test stage cp $CI_PROJECT_DIR/.gitlab-ci/generate_lava.py artifacts/. - cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/. - cp $CI_PROJECT_DIR/.gitlab-ci/lava-tracie.yml.jinja2 artifacts/. + cp $CI_PROJECT_DIR/.gitlab-ci/lava-*.yml.jinja2 artifacts/. MESA_ARTIFACT=mesa-${DEBIAN_ARCH}.tar.gz gzip -c artifacts/install.tar > ${MESA_ARTIFACT} _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
