From 59d909eb562d6e28e80d305f300e90507fd3b2e6 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Mon, 7 Oct 2024 18:52:51 -0300 Subject: [PATCH] ci/lava: Make perf jobs use pyutils artifact Following the merge of Merge Request #31151, we encountered an issue where the performance jobs were failing silently. Although these failures did not cause the pipeline to fail, they resulted in warnings for all merge requests that ran the .*-traces-performance jobs, putting critical performance data for the [Mesa Performance Driver dashboard](https://ci-stats-grafana.freedesktop.org/goto/G3xkvykHg?orgId=1) at risk. To resolve this issue, this commit updates the LAVA performance jobs to utilize the Pyutils artifact package, which is now the only required artifact for the jobs that run the LAVA job submitter. Fixes: dd5d737e6ca ("ci/lava: Use new pyutils container") Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/test-source-dep.yml | 3 ++- src/freedreno/ci/gitlab-ci-inc.yml | 3 ++- src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml | 3 ++- src/intel/ci/gitlab-ci-inc.yml | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index e4757b523d2..89ecf5ff2f6 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -121,7 +121,8 @@ # Always use the same device LAVA_TAGS: "cbg-0" # Ensure that we are using the release build artifact - S3_ARTIFACT_NAME: mesa-${ARCH}-default-release + LAVA_S3_ARTIFACT_NAME: mesa-${ARCH}-default-release + S3_ARTIFACT_NAME: mesa-python-test # Reset dependencies in performance jobs to enforce the release build artifact dependencies: null # Don't run in parallel. It is okay to performance jobs to take a little diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index 29c1ccef5af..fd1267eb80f 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -209,7 +209,8 @@ variables: JOB_PRIORITY: 40 # Ensure that we are using the release build artifact - S3_ARTIFACT_NAME: mesa-arm64-default-release + LAVA_S3_ARTIFACT_NAME: mesa-arm64-default-release + S3_ARTIFACT_NAME: mesa-python-test needs: - debian/x86_64_build - debian-arm64-release diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml index a3447912acf..407045dc832 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml @@ -38,7 +38,8 @@ allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. variables: JOB_PRIORITY: 40 - S3_ARTIFACT_NAME: "mesa-x86_64-default-release" + LAVA_S3_ARTIFACT_NAME: mesa-x86_64-default-release + S3_ARTIFACT_NAME: mesa-python-test needs: - kernel+rootfs_x86_64 - debian-release diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index 6e0069ba1a7..caa30177572 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -117,7 +117,8 @@ allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. variables: JOB_PRIORITY: 40 - S3_ARTIFACT_NAME: "mesa-x86_64-default-release" + LAVA_S3_ARTIFACT_NAME: mesa-x86_64-default-release + S3_ARTIFACT_NAME: mesa-python-test needs: - kernel+rootfs_x86_64 - debian-release @@ -402,7 +403,8 @@ HWCI_FREQ_MAX: "true" LAVA_TAGS: "cbg-0" # Ensure that we are using the release build artifact - S3_ARTIFACT_NAME: mesa-x86_64-default-release + LAVA_S3_ARTIFACT_NAME: mesa-x86_64-default-release + S3_ARTIFACT_NAME: mesa-python-test .iris-whl-traces-performance: extends: