From 1ed13ea81a53ad0d8045e402811718c946af45da Mon Sep 17 00:00:00 2001 From: Zane Fink Date: Thu, 1 Oct 2026 15:35:05 -0700 Subject: [PATCH] Keep CI clones in the Proteus workspace and only remove the job's own clone The Hubcast switch (#541) dropped CUSTOM_CI_BUILDS_DIR, so clones moved to the shared ~/.jacamar-ci/builds and rm -rf ${CI_BUILDS_DIR} deleted concurrent jobs' checkouts. --- .gitlab-ci.yml | 3 +++ .gitlab/custom-jobs-and-variables.yml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54e8c78c..1f342721 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,9 @@ # We define the following GitLab pipeline variables: variables: ##### LC GITLAB CONFIGURATION +# Keep Proteus clones out of the default ~/.jacamar-ci/builds, which other +# projects' CI jobs share and clean up. + CUSTOM_CI_BUILDS_DIR: "/usr/workspace/fink12/gitlab-runner-proteus" # Tells Gitlab to recursively update the submodules when cloning the project. # GIT_SUBMODULE_STRATEGY: recursive diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index f1af44fd..22d59b59 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -86,9 +86,10 @@ variables: variables: JOB_TEMPLATE_CANNOT_BE_EMPTY: "True" +# Remove only this job's clone; CI_BUILDS_DIR is shared with concurrent jobs. .remove-builds-dir: after_script: - - rm -rf ${CI_BUILDS_DIR} + - rm -rf ${CI_PROJECT_DIR} .clean-flux-allocation: after_script: