From b6435207ab8afcdb4798115598a46a6dca8ce33e Mon Sep 17 00:00:00 2001 From: Deborah Brouwer Date: Mon, 25 Nov 2024 01:18:46 -0800 Subject: [PATCH] ci: python-test rename artifacts The current python-test job creates and compresses python related artifacts for use by future jobs. The artifacts are currently named `mesa-python-test` which is somewhat misleading because they are not needed for testing python scripts or libraries. Rename the artifacts generated by the python-test job to be more descriptive of their purpose. Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 2 +- .gitlab-ci/lava/lava-gitlab-ci.yml | 2 +- .gitlab-ci/test-source-dep.yml | 2 +- src/freedreno/ci/gitlab-ci-inc.yml | 2 +- src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml | 2 +- src/intel/ci/gitlab-ci-inc.yml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 6f56dc91bc9..8e06e886514 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -821,7 +821,7 @@ python-test: - .build-common variables: GIT_STRATEGY: fetch - S3_ARTIFACT_NAME: mesa-python-test + S3_ARTIFACT_NAME: mesa-python-ci-artifacts timeout: 10m script: - .gitlab-ci/run-pytest.sh diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 4db44476ea1..f830ba88082 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -18,7 +18,7 @@ variables: JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz" JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.zst" LAVA_S3_ARTIFACT_NAME: "mesa-${ARCH}-default-debugoptimized" - S3_ARTIFACT_NAME: "mesa-python-test" + S3_ARTIFACT_NAME: "mesa-python-ci-artifacts" S3_RESULTS_UPLOAD: "${JOB_ARTIFACTS_BASE}" PIGLIT_NO_WINDOW: 1 VISIBILITY_GROUP: "Collabora+fdo" diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 89ecf5ff2f6..3e889f945c3 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -122,7 +122,7 @@ LAVA_TAGS: "cbg-0" # Ensure that we are using the release build artifact LAVA_S3_ARTIFACT_NAME: mesa-${ARCH}-default-release - S3_ARTIFACT_NAME: mesa-python-test + S3_ARTIFACT_NAME: mesa-python-ci-artifacts # 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 ce982cec7bc..a22669ddfba 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -213,7 +213,7 @@ JOB_PRIORITY: 40 # Ensure that we are using the release build artifact LAVA_S3_ARTIFACT_NAME: mesa-arm64-default-release - S3_ARTIFACT_NAME: mesa-python-test + S3_ARTIFACT_NAME: mesa-python-ci-artifacts 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 ea1a6ba3e91..6ee3b846a3b 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml @@ -39,7 +39,7 @@ variables: JOB_PRIORITY: 40 LAVA_S3_ARTIFACT_NAME: mesa-x86_64-default-release - S3_ARTIFACT_NAME: mesa-python-test + S3_ARTIFACT_NAME: mesa-python-ci-artifacts 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 0dd787bb149..24a8cbc938c 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -129,7 +129,7 @@ variables: JOB_PRIORITY: 40 LAVA_S3_ARTIFACT_NAME: mesa-x86_64-default-release - S3_ARTIFACT_NAME: mesa-python-test + S3_ARTIFACT_NAME: mesa-python-ci-artifacts needs: - kernel+rootfs_x86_64 - debian-release @@ -426,7 +426,7 @@ LAVA_TAGS: "cbg-0" # Ensure that we are using the release build artifact LAVA_S3_ARTIFACT_NAME: mesa-x86_64-default-release - S3_ARTIFACT_NAME: mesa-python-test + S3_ARTIFACT_NAME: mesa-python-ci-artifacts .iris-whl-traces-performance: extends: