Skip to content
Snippets Groups Projects
Commit eb8b9bd8 authored by Ulrich Schwickerath's avatar Ulrich Schwickerath
Browse files

Merge branch 'set-sast-config-1' into 'master'

Set sast config and move simana log files

See merge request !34
parents 52166892 21f97887
No related branches found
No related tags found
1 merge request!34Set sast config and move simana log files
Pipeline #9904409 passed
---
include:
- template: Jobs/SAST.gitlab-ci.yml
.vars: &vars
variables:
IMAGECC7: gitlab-registry.cern.ch/delphi/docker/builder-cc7:latest
......@@ -14,6 +17,8 @@
IMAGEUBUNTU22: gitlab-registry.cern.ch/delphi/docker/builder-ubuntu22:latest
IMAGEUBUNTU24: gitlab-registry.cern.ch/delphi/docker/builder-ubuntu24:latest
IMAGEDEBIAN12: gitlab-registry.cern.ch/delphi/docker/builder-debian12:latest
GITLAB_ADVANCED_SAST_ENABLED: 'true'
stages:
- common
- cernlib
......
......@@ -82,14 +82,15 @@ if [ -e $ARCHIVE/$name ]; then
# compile it
echo "building libraries and executables"
mkdir -p $DELSIM_ROOT/${path} || /bin/true
mkdir -p $DELSIM_ROOT/${path}/log || /bin/true
if [ $DES -eq 0 ]; then
make_dellib -p delsim -v $VERS -o compile -batch >& $DELSIM_ROOT/$path/make_simana_${VERS}.log
make_dellib -p delsim -v $VERS -o compile -batch >& $DELSIM_ROOT/$path/log/make_simana_${VERS}.log
rc=$?
# run a test job
if [ $rc -eq 0 ]; then
mkdir -p $DELSIM_ROOT/${path}/test || /bin/true
cd $DELSIM_ROOT/${path}/test
runsim -version ${VERS} -LABO CERN -NRUN 1000 -EBEAM 45.625 -igen qqps -NEVMAX 10
runsim -version ${VERS} -LABO CERN -NRUN 1000 -EBEAM 45.625 -igen qqps -NEVMAX 10 > ../log/simana_${VERS}_test.log 2>&1
rc=$?
if [ $rc -eq 0 ]; then
echo "Test job finished successfully"
......@@ -102,7 +103,7 @@ if [ -e $ARCHIVE/$name ]; then
fi
cd ..
else
make_dellib -p delsim -evsrv -v $VERS -o compile -batch >& $DELSIM_ROOT/$path/make_simana_rd_${VERS}.log
make_dellib -p delsim -evsrv -v $VERS -o compile -batch >& $DELSIM_ROOT/$path/log/make_simana_rd_${VERS}.log
rc=$?
if [ $rc -eq 0 ]; then
echo "Build of delana for event server succeeded"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment