Skip to content
Snippets Groups Projects
Commit d984acbe authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

moved detector build to the initialize CI step to avoid race conditions in multi-process jobs

parent b6dcbbb1
No related branches found
No related tags found
No related merge requests found
...@@ -7,11 +7,31 @@ default: ...@@ -7,11 +7,31 @@ default:
expire_in: 3 days expire_in: 3 days
stages: stages:
- generate - initialize
- process - process
- collect - collect
- finish - finish
detector:
stage: initialize
needs: []
timeout: 1 hour
cache:
key:
files:
- config/env.sh
- util/build_detector.sh
prefix: "$CI_COMMIT_REF_SLUG"
paths:
- .local/detector
- .local/lib
artifacts:
paths:
- .local/detector
- .local/lib
script:
- ./util/build_detector.sh
include: include:
- local: 'dis/config.yml' - local: 'dis/config.yml'
- local: 'dvmp/config.yml' - local: 'dvmp/config.yml'
......
...@@ -10,7 +10,7 @@ dis:generate: ...@@ -10,7 +10,7 @@ dis:generate:
dis:process: dis:process:
stage: process stage: process
needs: ["dis:generate"] needs: ["detector", "dis:generate"]
timeout: 1 hour timeout: 1 hour
artifacts: artifacts:
paths: paths:
......
...@@ -43,7 +43,8 @@ export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root" ...@@ -43,7 +43,8 @@ export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
## ============================================================================= ## =============================================================================
## Step 1: Build/install the desired detector package ## Step 1: Build/install the desired detector package
bash util/build_detector.sh ## TODO remove this
#bash util/build_detector.sh
## ============================================================================= ## =============================================================================
## Step 2: Run the simulation ## Step 2: Run the simulation
......
dvcs:process: dvcs:process:
stage: process stage: process
timeout: 1 hour timeout: 1 hour
needs: ["detector"]
script: script:
- echo "dvcd benchmark" - echo "dvcd benchmark"
artifacts: artifacts:
......
dvmp:generate: dvmp:generate:
image: eicweb.phy.anl.gov:4567/monte_carlo/lager/lager:unstable image: eicweb.phy.anl.gov:4567/monte_carlo/lager/lager:unstable
stage: generate stage: initialize
needs: [] needs: []
timeout: 1 hours timeout: 1 hours
cache: cache:
...@@ -19,7 +19,7 @@ dvmp:generate: ...@@ -19,7 +19,7 @@ dvmp:generate:
dvmp:process: dvmp:process:
stage: process stage: process
needs: ["dvmp:generate"] needs: ["detector", "dvmp:generate"]
timeout: 1 hour timeout: 1 hour
script: script:
- ./util/run_many.py dvmp/dvmp.sh --energy 10x100 --config jpsi_central --decay muon --decay electron --leading jpsi - ./util/run_many.py dvmp/dvmp.sh --energy 10x100 --config jpsi_central --decay muon --decay electron --leading jpsi
......
...@@ -76,7 +76,8 @@ PLOT_PREFIX=${DATA_PATH}/`util/print_fname.sh \ ...@@ -76,7 +76,8 @@ PLOT_PREFIX=${DATA_PATH}/`util/print_fname.sh \
## ============================================================================= ## =============================================================================
## Step 1: Build/install the desired detector package ## Step 1: Build/install the desired detector package
bash util/build_detector.sh # moved to different CI step TODO remove
#bash util/build_detector.sh
## ============================================================================= ## =============================================================================
## Step 2: Run the simulation ## Step 2: Run the simulation
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment