Commit 07a5ebfe authored by Vignesh Raman's avatar Vignesh Raman Committed by Rob Clark
Browse files

drm/ci: uprev mesa 

The current s3cp implementation does not work anymore after the
migration, and instead of fixing it and propagating the fix down to us,
it's simpler to directly use curl. Uprev mesa [1][2] to adapt these
changes. Also replace broken s3cp command with a curl wrapper call in
drm-ci.

[1] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34120
[2] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34244



Signed-off-by: default avatarVignesh Raman <vignesh.raman@collabora.com>
Patchwork: https://patchwork.freedesktop.org/patch/645597/


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 249a965c

drivers/gpu/drm/ci/build-igt.sh

+1 −1
Original line number Diff line number Diff line
@@ -71,4 +71,4 @@ tar -cf artifacts/igt.tar /igt 
# Pass needed files to the test stage

S3_ARTIFACT_NAME="igt.tar.gz"

gzip -c artifacts/igt.tar > ${S3_ARTIFACT_NAME}

ci-fairy s3cp --token-file "${S3_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${KERNEL_ARCH}/${S3_ARTIFACT_NAME}
 
s3_upload ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${KERNEL_ARCH}/

drivers/gpu/drm/ci/build.sh

+3 −3
Original line number Diff line number Diff line
@@ -148,13 +148,13 @@ if [[ "$UPLOAD_TO_MINIO" = "1" ]]; then 


    ls -l "${S3_JWT_FILE}"

    for f in $FILES_TO_UPLOAD; do

        ci-fairy s3cp --token-file "${S3_JWT_FILE}" /kernel/$f \

                https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/$f

        s3_upload /kernel/$f \

                https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/

    done



    S3_ARTIFACT_NAME="kernel-files.tar.zst"

    tar --zstd -cf $S3_ARTIFACT_NAME install

    ci-fairy s3cp --token-file "${S3_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/${S3_ARTIFACT_NAME}

    s3_upload ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/



    echo "Download vmlinux.xz from https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/vmlinux.xz"

fi

drivers/gpu/drm/ci/gitlab-ci.yml

+4 −2
Original line number Diff line number Diff line 
variables:

  DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa

  DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 82ab58f6c6f94fa80ca7e1615146f08356e3ba69

  DRM_CI_COMMIT_SHA: &drm-ci-commit-sha f73132f1215a37ce8ffc711a0136c90649aaf128



  UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git

  TARGET_BRANCH: drm-next
@@ -20,8 +20,10 @@ variables: 
          rm download-git-cache.sh

          set +o xtrace

  S3_JWT_FILE: /s3_jwt

  S3_JWT_HEADER_FILE: /s3_jwt_header

  S3_JWT_FILE_SCRIPT: |-

      echo -n '${S3_JWT}' > '${S3_JWT_FILE}' &&

      echo -n "Authorization: Bearer ${S3_JWT}" > '${S3_JWT_HEADER_FILE}' &&

      unset CI_JOB_JWT S3_JWT  # Unsetting vulnerable env variables

  S3_HOST: s3.freedesktop.org

  # This bucket is used to fetch the kernel image
@@ -251,7 +253,7 @@ make git archive: 
    - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .



    # Use id_tokens for JWT auth

    - ci-fairy s3cp --token-file "${S3_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/${S3_GITCACHE_BUCKET}/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz

    - s3_upload ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/${S3_GITCACHE_BUCKET}/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/





# Sanity checks of MR settings and commit logs

drivers/gpu/drm/ci/image-tags.yml

+1 −1
Original line number Diff line number Diff line 
variables:

   CONTAINER_TAG: "20250307-mesa-uprev"

   CONTAINER_TAG: "20250328-mesa-uprev"

   DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"

   DEBIAN_BASE_TAG: "${CONTAINER_TAG}"

drivers/gpu/drm/ci/lava-submit.sh

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/ 
cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/



tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .

ci-fairy s3cp --token-file "${S3_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"

s3_upload job-rootfs-overlay.tar.gz "https://${JOB_ARTIFACTS_BASE}"



# Prepare env vars for upload.

section_switch variables "Environment variables passed through to device:"