Skip to content

Commit bf357ce

Browse files
baltzelltongtongcao
authored andcommitted
fix gitlab ci, max 2 GB archive (#937)
1 parent c0da89d commit bf357ce

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

.gitlab-ci.yml

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ workflow:
1414

1515
default:
1616
interruptible: true
17+
before_script:
18+
- export CLARA_HOME=$CI_PROJECT_DIR/clara
19+
- export COATJAVA=$CI_PROJECT_DIR/coatjava
20+
- export PATH=$CLARA_HOME/plugins/clas12/bin:$PATH
21+
- export PATH=$CLARA_HOME/bin:$PATH
22+
- export PATH=$COATJAVA/bin:$PATH
23+
- echo $PATH
1724

1825
stages:
1926
- build
@@ -43,35 +50,29 @@ depana:
4350
download:
4451
stage: build
4552
script:
46-
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/clas_005038.evio.00000 ./
47-
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00001 ./
4853
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-d/clas_018779.evio.00001 ./
4954
artifacts:
5055
when: always
5156
expire_in: 1 day
5257
paths:
53-
- clas_005038.evio.00000
54-
- clas_021559.evio.00001
5558
- clas_018779.evio.00001
5659

5760
spotbugs:
5861
stage: test
5962
needs: [build]
6063
dependencies: [build]
6164
script:
62-
- >
63-
tar -xzf coatjava.tar.gz &&
64-
./build-coatjava.sh -T$JL_RUNNER_AVAIL_CPU --spotbugs --quiet --no-progress
65+
- tar -xzf coatjava.tar.gz
66+
- ./build-coatjava.sh -T$JL_RUNNER_AVAIL_CPU --spotbugs --quiet --no-progress
6567

6668
unit_tests:
6769
stage: test
6870
needs: [build]
6971
dependencies: [build]
7072
script:
71-
- >
72-
tar -xzf coatjava.tar.gz &&
73-
./build-coatjava.sh -T$JL_RUNNER_AVAIL_CPU --unittests --quiet --no-progress &&
74-
./validation/jacoco-aggregate.sh
73+
- tar -xzf coatjava.tar.gz
74+
- ./build-coatjava.sh -T$JL_RUNNER_AVAIL_CPU --unittests --quiet --no-progress
75+
- ./validation/jacoco-aggregate.sh
7576
artifacts:
7677
when: always
7778
expire_in: 1 day
@@ -83,16 +84,15 @@ docs:
8384
needs: [build,unit_tests]
8485
dependencies: [build,unit_tests]
8586
script:
86-
- >
87-
tar -xzf coatjava.tar.gz &&
88-
python3 -m venv venv &&
89-
source venv/bin/activate &&
90-
python3 -m pip install -r docs/mkdocs/requirements.txt &&
91-
./docs/mkdocs/generate.sh pages &&
92-
libexec/build-javadocs.sh &&
93-
ls -l && ls -l pages && ls -l publish &&
94-
mv target/reports/apidocs pages/javadoc &&
95-
cp -r publish pages/jacoco
87+
- tar -xzf coatjava.tar.gz
88+
- python3 -m venv venv
89+
- source venv/bin/activate
90+
- python3 -m pip install -r docs/mkdocs/requirements.txt
91+
- ./docs/mkdocs/generate.sh pages
92+
- libexec/build-javadocs.sh
93+
- ls -l && ls -l pages && ls -l publish
94+
- mv target/reports/apidocs pages/javadoc
95+
- cp -r publish pages/jacoco
9696
artifacts:
9797
when: always
9898
expire_in: 7 days
@@ -119,14 +119,11 @@ eb:
119119
clara:
120120
allow_failure: true
121121
stage: test
122-
needs: [build]
123-
dependencies: [build]
122+
needs: [build,download]
123+
dependencies: [build,download]
124124
script:
125-
- >
126-
tar -xzf clara.tar.gz &&
127-
./clara/plugins/clas12/bin/run-clara -c ./clara
128-
-t $JL_RUNNER_AVAIL_CPU -y ./etc/services/rgd-clarode.yml
129-
-n 100 -o ./out clas_018779.evio.00001
125+
- tar -xzf clara.tar.gz && ls -l
126+
- run-clara -v -c $CLARA_HOME -t $JL_RUNNER_AVAIL_CPU -y ./etc/services/rgd-clarode.yml -n 100 -o out clas_018779.evio.00001
130127

131128
profile:
132129
stage: test
@@ -140,10 +137,10 @@ profile:
140137
deploy:
141138
stage: deploy
142139
script:
143-
- echo DEPLOY!!!
140+
- echo DEPLOY!
144141

145142
release:
146143
stage: deploy
147144
script:
148-
- echo RELEASE!!!
145+
- echo RELEASE!
149146

bin/run-clara

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Options:\n
1515
\t-n number of events (default=-1)\n
1616
\t-m merge output files (see dependencies below)\n
1717
\t-l larger JVM memory requests\n
18+
\t-v verbose output\n
1819
\t-h print this help and exit\n\n
1920
Merging outputs (-m) requires hipo-utils and yq (https://github.com/mikefarah/yq).'
2021

@@ -26,7 +27,7 @@ function error() {
2627
threads=2
2728
prefix=rec_
2829
CLARA_USER_DATA=.
29-
while getopts y:o:p:c:t:n:lqmh opt
30+
while getopts y:o:p:c:t:n:lqmvh opt
3031
do
3132
case $opt in
3233
y) yaml=$OPTARG ;;
@@ -38,6 +39,7 @@ do
3839
l) large=1 ;;
3940
m) merge=1 ;;
4041
q) quiet=1 ;;
42+
v) set -o xtrace ;;
4143
h) echo -e "\n$usage" && echo -e $info && exit 0 ;;
4244
esac
4345
done

libexec/scaling

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ def run(cmd):
2626
pass
2727

2828
def benchmark(cfg, threads):
29-
import collections
29+
import sys,shutil,collections
30+
if not shutil.which('run-clara'):
31+
sys.exit('run-clara is not in $PATH')
3032
exiting,benchmarks = False,collections.OrderedDict()
3133
cmd = ['run-clara',
3234
'-c',cfg.c,

0 commit comments

Comments
 (0)