ci: Name results dir in artifact according to job name

In addition don't base the artifact filename on the CI_JOB_NAME,
because of the "parallel" specifier the name contains a '/' which
breaks the naming.

Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/735>
macos/master
Gert Wollny 3 years ago committed by Gert Wollny
parent 954bc46294
commit f006231e0d
  1. 6
      .gitlab-ci.yml

@ -156,13 +156,17 @@ make check venus:
stage: test stage: test
extends: extends:
- .set-image-base-tag - .set-image-base-tag
before_script:
- export CI_JOB_NAME_SANITIZED="$(echo $CI_JOB_NAME | tr ' /' '--')"
variables: variables:
MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_PATH} MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_PATH}
MESA_IMAGE_TAG: ${DEBIAN_X86_TEST_GL_TAG} MESA_IMAGE_TAG: ${DEBIAN_X86_TEST_GL_TAG}
script: script:
- export DEQP_RESULTS_DIR="results/${CI_JOB_NAME_SANITIZED}"
- export PIGLIT_RESULTS_DIR="results/${CI_JOB_NAME_SANITIZED}"
- .gitlab-ci/container/debian/x86_test.sh - .gitlab-ci/container/debian/x86_test.sh
artifacts: artifacts:
name: "virgl_${CI_JOB_NAME}" name: "virgl-result"
when: always when: always
paths: paths:
- results/ - results/

Loading…
Cancel
Save