Skip to content
Snippets Groups Projects
Commit 103cb510 authored by Nicolas Richart's avatar Nicolas Richart
Browse files

Moving data to /work since they should not be deleted

parent 823c2b0f
1 merge request!2CI update to use squashfs
Pipeline #201737 failed
...@@ -17,7 +17,7 @@ workflow: ...@@ -17,7 +17,7 @@ workflow:
variables: variables:
TERM: ansi TERM: ansi
CI_DATA: "/scratch/richart/ci" CI_DATA: "/work/scitas-ge/richart/ci"
.parallel_definition: .parallel_definition:
parallel: parallel:
...@@ -102,14 +102,6 @@ spack:checkout: ...@@ -102,14 +102,6 @@ spack:checkout:
before_script: before_script:
- git config --global --add --bool advice.detachedHead false - git config --global --add --bool advice.detachedHead false
script: script:
# - |
# for i in overlayfs squashfs-cache buildcache spack-mirror
# do
# if [ ! -e ${CI_DATA}/$i ]
# then
# mkdir -p ${CI_DATA}/$i
# fi
# done
- ./ci/prepare_squashfs.sh - ./ci/prepare_squashfs.sh
timeout: 1h timeout: 1h
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -o pipefail set -o pipefail
set -o nounset set -o nounset
set -o errexit
source ${CI_PROJECT_DIR}/ci/stack_env.sh source ${CI_PROJECT_DIR}/ci/stack_env.sh
for i in overlayfs squashfs-cache buildcache spack-mirror for i in overlayfs squashfs-cache buildcache spack-mirror
...@@ -13,6 +13,8 @@ do ...@@ -13,6 +13,8 @@ do
fi fi
done done
set +o errexit
# Check if MR as squashfs # Check if MR as squashfs
sqfs_image=$(ls -t1 ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}*.sqfs 2> /dev/null | head -1) sqfs_image=$(ls -t1 ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}*.sqfs 2> /dev/null | head -1)
if [ $? -ne 0 ] if [ $? -ne 0 ]
...@@ -31,6 +33,8 @@ then ...@@ -31,6 +33,8 @@ then
echo "Found ${sqfs_base_image}" echo "Found ${sqfs_base_image}"
fi fi
set -o errexit
# Link MR sqaushfs to the one of default branch # Link MR sqaushfs to the one of default branch
sqfs_image=${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs sqfs_image=${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs
...@@ -40,6 +44,7 @@ then ...@@ -40,6 +44,7 @@ then
echo "Linking ${sqfs_image} -> ${sqfs_base_image}" echo "Linking ${sqfs_image} -> ${sqfs_base_image}"
else else
set -o errexit
if [ ${sqfs_image} != ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs ]; if [ ${sqfs_image} != ${CI_DATA}/squashfs-cache/${stack}-${environment}-${squash_id}.sqfs ];
then then
cd ${CI_DATA}/squashfs-cache cd ${CI_DATA}/squashfs-cache
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment