From ef3091736c3ec63303e483d8f3cb0924b4a4fa4f Mon Sep 17 00:00:00 2001 From: Vignesh Raman Date: Wed, 22 Jan 2025 11:53:14 +0530 Subject: [PATCH] ci: use CI_PROJECT_NAME for artifacts name Since mesa is used in drm-ci, the artifacts in drm-ci jobs have the 'mesa' prefix. This change replaces the hardcoded 'mesa' prefix in the artifacts name with the CI_PROJECT_NAME variable. Signed-off-by: Vignesh Raman Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/build/gitlab-ci.yml | 2 +- .gitlab-ci/test/gitlab-ci.yml | 10 +++++----- src/gallium/drivers/d3d12/ci/gitlab-ci.yml | 2 +- src/microsoft/ci/gitlab-ci.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5f9c883351..462a97ff483 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -257,7 +257,7 @@ include: .ci-deqp-artifacts: artifacts: - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" when: always untracked: false paths: diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 05c1d01e572..5484ac7de04 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -15,7 +15,7 @@ # We don't want to download any previous job's artifacts dependencies: [] artifacts: - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" when: always paths: - _build/meson-logs/*.txt diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 8f7268d8aee..680be65f7ff 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -13,7 +13,7 @@ - section_end ldd_section artifacts: when: always - name: "mesa_${CI_JOB_NAME}" + name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - results/ rules: @@ -143,7 +143,7 @@ yaml-toml-shell-py-test: .piglit-traces-test: artifacts: when: on_failure - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" reports: junit: results/junit.xml paths: @@ -177,7 +177,7 @@ yaml-toml-shell-py-test: - ./install/fossilize-runner.sh artifacts: when: on_failure - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - results/ @@ -205,7 +205,7 @@ yaml-toml-shell-py-test: BM_ROOTFS: /rootfs-${DEBIAN_ARCH} artifacts: when: always - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - results/ - serial*.txt @@ -399,7 +399,7 @@ yaml-toml-shell-py-test: artifacts: when: always - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - results reports: diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml index c589cd25778..fad7f4e1d35 100644 --- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml +++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml @@ -23,7 +23,7 @@ - . _install/piglit_run.ps1 artifacts: when: on_failure - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - logs/ variables: diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml index 8ee1963aa50..f67b8fcfaae 100644 --- a/src/microsoft/ci/gitlab-ci.yml +++ b/src/microsoft/ci/gitlab-ci.yml @@ -18,7 +18,7 @@ test-spirv2dxil-windows: - . _install/spirv2dxil_run.ps1 artifacts: when: on_failure - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - spirv2dxil_results.txt @@ -42,7 +42,7 @@ test-dozen-deqp: - . _install/deqp_runner_run.ps1 artifacts: when: on_failure - name: "mesa_${CI_JOB_NAME}" + name: "{CI_PROJECT_NAME}_${CI_JOB_NAME}" paths: - results/ reports: