From d16183c05345fc33e5b196635666af09489a0bab Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Tue, 24 Jan 2023 15:54:39 +0100
Subject: [PATCH] * .gitlab-ci.yml: Use pipeline id to name volumes.

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2006ee7f..348bacba1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -276,7 +276,7 @@ debpkg-stable:
     - stable
   script:
     - docker pull gitlab-registry.lre.epita.fr/spot/buildenv/debian:stable
-    - vol=spot-stable-$CI_COMMIT_SHA
+    - vol=spot-stable-$CI_COMMIT_SHA-$CI_PIPELINE_ID
     - docker volume create $vol
     - exitcode=0
     - docker run -v $vol:/build/result  --name helper-$vol gitlab-registry.lre.epita.fr/spot/buildenv/debian:stable ./build-spot.sh $CI_COMMIT_REF_NAME -j${NBPROC-1} || exitcode=$?
@@ -304,7 +304,7 @@ debpkg-stable-i386:
   needs: ["debpkg-stable"]
   script:
     - docker pull gitlab-registry.lre.epita.fr/spot/buildenv/debian-i386:stable
-    - vol=spot-stable-$CI_COMMIT_SHA
+    - vol=spot-stable-$CI_COMMIT_SHA-$CI_PIPELINE_ID
     - docker volume create $vol
     - exitcode=0
     - docker create -v $vol:/build/result --name helper-$vol gitlab-registry.lre.epita.fr/spot/buildenv/debian-i386:stable ./bin-spot.sh -j${NBPROC-1} || exitcode=$?
@@ -331,7 +331,7 @@ debpkg-unstable:
     - next
   script:
     - docker pull gitlab-registry.lre.epita.fr/spot/buildenv/debian
-    - vol=spot-unstable-$CI_COMMIT_SHA
+    - vol=spot-unstable-$CI_COMMIT_SHA-$CI_PIPELINE_ID
     - docker volume create $vol
     - exitcode=0
     - docker run -v $vol:/build/result --name helper-$vol gitlab-registry.lre.epita.fr/spot/buildenv/debian ./build-spot.sh $CI_COMMIT_REF_NAME -j${NBPROC-1} || exitcode=$?
@@ -357,7 +357,7 @@ debpkg-unstable-i386:
   needs: ["debpkg-unstable"]
   script:
     - docker pull gitlab-registry.lre.epita.fr/spot/buildenv/debian-i386
-    - vol=spot-unstable-$CI_COMMIT_SHA
+    - vol=spot-unstable-$CI_COMMIT_SHA-$CI_PIPELINE_ID
     - docker volume create $vol
     - exitcode=0
     - docker create -v $vol:/build/result --name helper-$vol gitlab-registry.lre.epita.fr/spot/buildenv/debian-i386 ./bin-spot.sh -j${NBPROC-1} || exitcode=$?