2023-09-22 17:25:04

by Helen Koike

Subject: [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build

When building containers, some rust packages were installed without
locking the dependencies version, which got updated and started giving
errors like:

error: failed to compile `bindgen-cli v0.62.0`, intermediate artifacts can be found at `/tmp/cargo-installkNKRwf`
Caused by:
package `rustix v0.38.13` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0

A patch to Mesa was recently added fixing this error, so update it.

Signed-off-by: Helen Koike <[email protected]>

---

v2:
- point to upstream mesa/mesa (solved the TODO and removed RFC tag)
---
drivers/gpu/drm/ci/gitlab-ci.yml | 15 ++++++++++++++-
drivers/gpu/drm/ci/lava-submit.sh | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index 2c4df53f5dfe..522f83db1a07 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -1,6 +1,6 @@
variables:
DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa
- DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 0dc961645c4f0241f8512cb0ec3ad59635842072
+ DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 1cdc4be14b66108ae0e8069686ac3efe52bef3cb

UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
TARGET_BRANCH: drm-next
@@ -24,6 +24,8 @@ variables:
PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
# per-job artifact storage on MinIO
JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
+ # default kernel for rootfs before injecting the current kernel tree
+ KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d

LAVA_JOB_PRIORITY: 30

@@ -86,6 +88,17 @@ include:
- '/.gitlab-ci/container/gitlab-ci.yml'
- '/.gitlab-ci/test/gitlab-ci.yml'
- '/.gitlab-ci/lava/lava-gitlab-ci.yml'
+ - '/src/microsoft/ci/gitlab-ci-inc.yml'
+ - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml'
+ - '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml'
+ - '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml'
+ - '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml'
+ - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml'
+ - '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml'
+ - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml'
+ - '/src/intel/ci/gitlab-ci-inc.yml'
+ - '/src/freedreno/ci/gitlab-ci-inc.yml'
+ - '/src/amd/ci/gitlab-ci-inc.yml'
- drivers/gpu/drm/ci/image-tags.yml
- drivers/gpu/drm/ci/container.yml
- drivers/gpu/drm/ci/static-checks.yml
diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh
index 0c4456b21b0f..379f26ea87cc 100755
--- a/drivers/gpu/drm/ci/lava-submit.sh
+++ b/drivers/gpu/drm/ci/lava-submit.sh
@@ -22,7 +22,7 @@ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/

# Prepare env vars for upload.
section_start variables "Variables passed through:"
-KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \
+KERNEL_IMAGE_BASE="https://${BASE_SYSTEM_HOST_PATH}" \
artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh
section_end variables

--
2.34.1

2023-09-28 00:32:41

by Jessica Zhang

Subject: Re: [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build

On 9/22/2023 10:12 AM, Helen Koike wrote:
> When building containers, some rust packages were installed without
> locking the dependencies version, which got updated and started giving
> errors like:
>
> error: failed to compile `bindgen-cli v0.62.0`, intermediate artifacts can be found at `/tmp/cargo-installkNKRwf`
> Caused by:
> package `rustix v0.38.13` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0
>
> A patch to Mesa was recently added fixing this error, so update it.
>
> Signed-off-by: Helen Koike <[email protected]>

Tested-by: Jessica Zhang <[email protected]>
Acked-by: Jessica Zhang <[email protected]>

>
> ---
>
> v2:
> - point to upstream mesa/mesa (solved the TODO and removed RFC tag)
> ---
> drivers/gpu/drm/ci/gitlab-ci.yml | 15 ++++++++++++++-
> drivers/gpu/drm/ci/lava-submit.sh | 2 +-
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
> index 2c4df53f5dfe..522f83db1a07 100644
> --- a/drivers/gpu/drm/ci/gitlab-ci.yml
> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml
> @@ -1,6 +1,6 @@
> variables:
> DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa
> - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 0dc961645c4f0241f8512cb0ec3ad59635842072
> + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 1cdc4be14b66108ae0e8069686ac3efe52bef3cb
>
> UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
> TARGET_BRANCH: drm-next
> @@ -24,6 +24,8 @@ variables:
> PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
> # per-job artifact storage on MinIO
> JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
> + # default kernel for rootfs before injecting the current kernel tree
> + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d
>
> LAVA_JOB_PRIORITY: 30
>
> @@ -86,6 +88,17 @@ include:
> - '/.gitlab-ci/container/gitlab-ci.yml'
> - '/.gitlab-ci/test/gitlab-ci.yml'
> - '/.gitlab-ci/lava/lava-gitlab-ci.yml'
> + - '/src/microsoft/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml'
> + - '/src/intel/ci/gitlab-ci-inc.yml'
> + - '/src/freedreno/ci/gitlab-ci-inc.yml'
> + - '/src/amd/ci/gitlab-ci-inc.yml'
> - drivers/gpu/drm/ci/image-tags.yml
> - drivers/gpu/drm/ci/container.yml
> - drivers/gpu/drm/ci/static-checks.yml
> diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh
> index 0c4456b21b0f..379f26ea87cc 100755
> --- a/drivers/gpu/drm/ci/lava-submit.sh
> +++ b/drivers/gpu/drm/ci/lava-submit.sh
> @@ -22,7 +22,7 @@ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/
>
> # Prepare env vars for upload.
> section_start variables "Variables passed through:"
> -KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \
> +KERNEL_IMAGE_BASE="https://${BASE_SYSTEM_HOST_PATH}" \
> artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh
> section_end variables
>
> --
> 2.34.1
>

2023-10-09 00:58:39

by Helen Koike

Subject: Re: [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build

Dear maintainers,

Do not pick this patch, I re-sent it as part of the series
[PATCH 0/9] drm/ci: fixes and improvements

https://lists.freedesktop.org/archives/dri-devel/2023-October/425909.html

Thanks
Regards,
Helen

On 22/09/2023 14:12, Helen Koike wrote:
> When building containers, some rust packages were installed without
> locking the dependencies version, which got updated and started giving
> errors like:
>
> error: failed to compile `bindgen-cli v0.62.0`, intermediate artifacts can be found at `/tmp/cargo-installkNKRwf`
> Caused by:
> package `rustix v0.38.13` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0
>
> A patch to Mesa was recently added fixing this error, so update it.
>
> Signed-off-by: Helen Koike <[email protected]>
>
> ---
>
> v2:
> - point to upstream mesa/mesa (solved the TODO and removed RFC tag)
> ---
> drivers/gpu/drm/ci/gitlab-ci.yml | 15 ++++++++++++++-
> drivers/gpu/drm/ci/lava-submit.sh | 2 +-
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
> index 2c4df53f5dfe..522f83db1a07 100644
> --- a/drivers/gpu/drm/ci/gitlab-ci.yml
> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml
> @@ -1,6 +1,6 @@
> variables:
> DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa
> - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 0dc961645c4f0241f8512cb0ec3ad59635842072
> + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 1cdc4be14b66108ae0e8069686ac3efe52bef3cb
>
> UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
> TARGET_BRANCH: drm-next
> @@ -24,6 +24,8 @@ variables:
> PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
> # per-job artifact storage on MinIO
> JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
> + # default kernel for rootfs before injecting the current kernel tree
> + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d
>
> LAVA_JOB_PRIORITY: 30
>
> @@ -86,6 +88,17 @@ include:
> - '/.gitlab-ci/container/gitlab-ci.yml'
> - '/.gitlab-ci/test/gitlab-ci.yml'
> - '/.gitlab-ci/lava/lava-gitlab-ci.yml'
> + - '/src/microsoft/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml'
> + - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml'
> + - '/src/intel/ci/gitlab-ci-inc.yml'
> + - '/src/freedreno/ci/gitlab-ci-inc.yml'
> + - '/src/amd/ci/gitlab-ci-inc.yml'
> - drivers/gpu/drm/ci/image-tags.yml
> - drivers/gpu/drm/ci/container.yml
> - drivers/gpu/drm/ci/static-checks.yml
> diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh
> index 0c4456b21b0f..379f26ea87cc 100755
> --- a/drivers/gpu/drm/ci/lava-submit.sh
> +++ b/drivers/gpu/drm/ci/lava-submit.sh
> @@ -22,7 +22,7 @@ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/
>
> # Prepare env vars for upload.
> section_start variables "Variables passed through:"
> -KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \
> +KERNEL_IMAGE_BASE="https://${BASE_SYSTEM_HOST_PATH}" \
> artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh
> section_end variables
>