drm/ci: remove CI_PRE_CLONE_SCRIPT

[PATCH v1] drm/ci: remove CI_PRE_CLONE_SCRIPT

Posted by Vignesh Raman 9 months, 3 weeks ago

If we are not caching the git archive, do not
set CI_PRE_CLONE_SCRIPT. Setting it makes CI
try to download the cache first, and if it is
missing, it tries to clone the repo within a
time limit, which can cause build failures.

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
---
 drivers/gpu/drm/ci/gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index f4e324e156db..0bc4ac344757 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -13,12 +13,6 @@ variables:
   FDO_UPSTREAM_REPO: helen.fornazier/linux   # The repo where the git-archive daily runs
   MESA_TEMPLATES_COMMIT: &ci-templates-commit d5aa3941aa03c2f716595116354fb81eb8012acb
   DRM_CI_PROJECT_URL: https://gitlab.freedesktop.org/${DRM_CI_PROJECT_PATH}
-  CI_PRE_CLONE_SCRIPT: |-
-          set -o xtrace
-          curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s ${DRM_CI_PROJECT_URL}/-/raw/${DRM_CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh -o download-git-cache.sh
-          bash download-git-cache.sh
-          rm download-git-cache.sh
-          set +o xtrace
   S3_JWT_FILE: /s3_jwt
   S3_JWT_FILE_SCRIPT: |-
       echo -n '${S3_JWT}' > '${S3_JWT_FILE}' &&
-- 
2.47.2

Re: [PATCH v1] drm/ci: remove CI_PRE_CLONE_SCRIPT

Posted by Dmitry Baryshkov 9 months, 3 weeks ago

On Thu, Feb 27, 2025 at 10:06:24AM +0530, Vignesh Raman wrote:
> If we are not caching the git archive, do not
> set CI_PRE_CLONE_SCRIPT. Setting it makes CI
> try to download the cache first, and if it is
> missing, it tries to clone the repo within a
> time limit, which can cause build failures.

Please wrap the commit message according to the guidelines. 47 chars in
a line is way too short.

BTW: this didn't help with the python-artifacts issue. It still times
out.

> 
> Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
> ---
>  drivers/gpu/drm/ci/gitlab-ci.yml | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
> index f4e324e156db..0bc4ac344757 100644
> --- a/drivers/gpu/drm/ci/gitlab-ci.yml
> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml
> @@ -13,12 +13,6 @@ variables:
>    FDO_UPSTREAM_REPO: helen.fornazier/linux   # The repo where the git-archive daily runs
>    MESA_TEMPLATES_COMMIT: &ci-templates-commit d5aa3941aa03c2f716595116354fb81eb8012acb
>    DRM_CI_PROJECT_URL: https://gitlab.freedesktop.org/${DRM_CI_PROJECT_PATH}
> -  CI_PRE_CLONE_SCRIPT: |-
> -          set -o xtrace
> -          curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s ${DRM_CI_PROJECT_URL}/-/raw/${DRM_CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh -o download-git-cache.sh
> -          bash download-git-cache.sh
> -          rm download-git-cache.sh
> -          set +o xtrace
>    S3_JWT_FILE: /s3_jwt
>    S3_JWT_FILE_SCRIPT: |-
>        echo -n '${S3_JWT}' > '${S3_JWT_FILE}' &&
> -- 
> 2.47.2
> 

-- 
With best wishes
Dmitry

Re: [PATCH v1] drm/ci: remove CI_PRE_CLONE_SCRIPT

Posted by Vignesh Raman 9 months, 3 weeks ago

Hi Dmitry,

On 27/02/25 11:21, Dmitry Baryshkov wrote:
> On Thu, Feb 27, 2025 at 10:06:24AM +0530, Vignesh Raman wrote:
>> If we are not caching the git archive, do not
>> set CI_PRE_CLONE_SCRIPT. Setting it makes CI
>> try to download the cache first, and if it is
>> missing, it tries to clone the repo within a
>> time limit, which can cause build failures.
> 
> Please wrap the commit message according to the guidelines. 47 chars in
> a line is way too short.
> 
> BTW: this didn't help with the python-artifacts issue. It still times
> out.

The issue was with shallow cloning, and I have posted another patch.
https://lore.kernel.org/dri-devel/20250228031501.483475-1-vignesh.raman@collabora.com/T/#u

The commit message is wrapped according to the guidelines in this patch.

Thanks.

Regards,
Vignesh

> 
>>
>> Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
>> ---
>>   drivers/gpu/drm/ci/gitlab-ci.yml | 6 ------
>>   1 file changed, 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
>> index f4e324e156db..0bc4ac344757 100644
>> --- a/drivers/gpu/drm/ci/gitlab-ci.yml
>> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml
>> @@ -13,12 +13,6 @@ variables:
>>     FDO_UPSTREAM_REPO: helen.fornazier/linux   # The repo where the git-archive daily runs
>>     MESA_TEMPLATES_COMMIT: &ci-templates-commit d5aa3941aa03c2f716595116354fb81eb8012acb
>>     DRM_CI_PROJECT_URL: https://gitlab.freedesktop.org/${DRM_CI_PROJECT_PATH}
>> -  CI_PRE_CLONE_SCRIPT: |-
>> -          set -o xtrace
>> -          curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s ${DRM_CI_PROJECT_URL}/-/raw/${DRM_CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh -o download-git-cache.sh
>> -          bash download-git-cache.sh
>> -          rm download-git-cache.sh
>> -          set +o xtrace
>>     S3_JWT_FILE: /s3_jwt
>>     S3_JWT_FILE_SCRIPT: |-
>>         echo -n '${S3_JWT}' > '${S3_JWT_FILE}' &&
>> -- 
>> 2.47.2
>>
>