Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scitas-software-stacks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SCITAS
Software stack
scitas-software-stacks
Commits
103cb510
Commit
103cb510
authored
7 months ago
by
Nicolas Richart
Browse files
Options
Downloads
Patches
Plain Diff
Moving data to /work since they should not be deleted
parent
823c2b0f
Loading
Loading
1 merge request
!2
CI update to use squashfs
Pipeline
#201737
failed
7 months ago
Stage: .pre
Stage: environment
Stage: compilers
Stage: concretize
Stage: install
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-9
1 addition, 9 deletions
.gitlab-ci.yml
ci/prepare_squashfs.sh
+6
-1
6 additions, 1 deletion
ci/prepare_squashfs.sh
with
7 additions
and
10 deletions
.gitlab-ci.yml
+
1
−
9
View file @
103cb510
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
ci/prepare_squashfs.sh
+
6
−
1
View file @
103cb510
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment