Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hep-workloads
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HEP-Benchmarks
hep-workloads
Merge requests
!167
Add two protections for silent shrinkwrap failures (
BMK-136
)
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Add two protections for silent shrinkwrap failures (
BMK-136
)
valassi/hep-workloads:BMK-136
into
qa
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Andrea Valassi
requested to merge
valassi/hep-workloads:BMK-136
into
qa
6 years ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
Closes
BMK-136
0
0
Merge request reports
Compare
qa
qa (base)
and
latest version
latest version
ca997651
1 commit,
6 years ago
1 file
+
7
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
build-executor/main.sh
+
7
−
3
Options
@@ -132,8 +132,10 @@ function run_docker_wl(){
execute docker run
${
strace
}
--rm
-v
$CIENV_JOBDIR
/results:/results
-v
$MAIN_HEPWLBUILDDIR
:
$MAIN_HEPWLBUILDDIR
-w
$MAIN_HEPWLBUILDDIR
-v
$CIENV_CVMFSVOLUME
:/cvmfs:shared
$theimage
$HEPWL_BMKOPTS
||
fail
"[run_docker_wl] docker run
$theimage
"
date
for
acvmfs
in
`
ls
${
MAIN_CVMFSTRACESDIR
}
|
sed
-e
's@cvmfs-\([^\.]*\)\.cern\.ch.*@\1@'
`
;
do
echo
"[run_docker_wl] Flush cvmfs trace for
$acvmfs
"
cvmfs_talk
-i
${
acvmfs
}
.cern.ch tracebuffer flush
# fix BMK-3 (see CVM-1682)
echo
"[run_docker_wl] cvmfs flush trace for
$acvmfs
"
if
!
cvmfs_talk
-i
${
acvmfs
}
.cern.ch tracebuffer flush
;
then
# fix BMK-3 (see CVM-1682)
fail
"[run_docker_wl] cvmfs flush
$acvmfs
"
# fix BMK-136 (flush was silently failing, leading to missing cvmfs files)
fi
done
echo
"[run_docker_wl] finished at
$(
date
)
"
return
0
@@ -178,7 +180,9 @@ EOF
echo
"[run_shrinkwrap] reponame
$reponame
"
date
echo
"[run_shrinkwrap] python /usr/libexec/cvmfs/shrinkwrap/spec_builder.py --policy=exact
${
MAIN_CVMFSTRACESDIR
}
/
$acvmfs
${
MAIN_CVMFSTRACESDIR
}
/
$specname
"
python /usr/libexec/cvmfs/shrinkwrap/spec_builder.py
--policy
=
exact
${
MAIN_CVMFSTRACESDIR
}
/
$acvmfs
${
MAIN_CVMFSTRACESDIR
}
/
$specname
if
!
python /usr/libexec/cvmfs/shrinkwrap/spec_builder.py
--policy
=
exact
${
MAIN_CVMFSTRACESDIR
}
/
$acvmfs
${
MAIN_CVMFSTRACESDIR
}
/
$specname
;
then
fail
"[run_shrinkwrap] spec_builder.py"
# fix BMK-136 (spec_builder was silently failing, leading to missing cvmfs files)
fi
date
trimname
=
${
reponame
/.cern.ch
}
spec_var
=
HEPWL_EXTEND_
${
trimname
^^
}
_SPEC
Loading