Commit 7ce6b657 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Resolve "Stick to local prefix for all in-pipeline install."

- Also added optional needs jobs for event views
- Need to set DETECTOR_EVENT_VIEWS=ON for them to be added into the pipeline.
parent a2d52114
Pipeline #8971 passed with stages
in 5 minutes and 53 seconds
......@@ -10,28 +10,39 @@ workflow:
default:
before_script:
- mkdir -p images && mkdir -p doc/
- git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git && ln -s accelerator/eic
- mkdir build && cd build && cmake ../. -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=/usr/local && make -j20 && make install && cd .. || exit 1
- source .local/bin/env.sh
artifacts:
expire_in: 72 hours
paths:
- images/
- doc/
- .local/detector
- .local/lib
- .local/bin
- .local/include
- .local/share
- results
- config
- images
- doc
- juggler.env
reports:
dotenv: juggler.env
stages:
- config
- initialize
- build
- docs
- test
- collect
- finalize
- deploy
env:
stage: config
common:setup:
stage: config
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
before_script:
- git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
script:
- export JUGGLER_DETECTOR="topside"
- |
......@@ -42,17 +53,24 @@ env:
echo "JUGGLER_DETECTOR_VERSION=$CI_COMMIT_REF_NAME" >> juggler.env
echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
fi
artifacts:
reports:
dotenv: juggler.env
- source setup/bin/env.sh && ./setup/bin/install_common.sh
common:detector:
stage: initialize
needs: ["common:setup"]
script:
- source .local/bin/env.sh && build_detector.sh
- mkdir_local_data_link sim_output
- mkdir -p results
- mkdir -p config
- print_env.sh
compile:
stage: build
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["env"]
- ["common:detector"]
script:
- echo "Build successful."
......@@ -62,10 +80,6 @@ compile:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["compile"]
artifacts:
paths:
- images/
- doc/
include:
- local: 'views/view1.yml'
......@@ -111,7 +125,7 @@ overlap_check:
needs:
- ["compile"]
script:
- checkOverlaps -c topside.xml | tee doc/overlap_check.out
- checkOverlaps -c ${DETECTOR_PATH}/topside.xml | tee doc/overlap_check.out
- echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..."
- if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
......@@ -122,7 +136,7 @@ topside:config_testing:
needs:
- ["compile"]
script:
- checkOverlaps -c topside.xml | tee doc/overlap_check.out | wc -l
- checkOverlaps -c ${DETECTOR_PATH}/topside.xml | tee doc/overlap_check.out | wc -l
- cat doc/overlap_check.out
allow_failure: true
......@@ -136,7 +150,7 @@ benchmarks:reconstruction:
trigger:
project: EIC/benchmarks/reconstruction_benchmarks
strategy: depend
needs: ["env","overlap_check","report"]
needs: ["common:detector","overlap_check","report"]
benchmarks:physics:
stage: deploy
......@@ -148,7 +162,7 @@ benchmarks:physics:
trigger:
project: EIC/benchmarks/physics_benchmarks
strategy: depend
needs: ["env","overlap_check","report"]
needs: ["common:detector","overlap_check","report"]
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
......
......@@ -92,23 +92,27 @@ rm -f *.prim
if [ "${DETECTOR_ONLY}" -eq "1" ] ; then
./scripts/run_topside.py -i scripts/input_data/few_events.hepmc \
-o derp.root -n 1 \
--ui csh --vis -b -m macro/dawn_picture.mac &
./scripts/run_topside.py \
--compact ${DETECTOR_PATH}/topside.xml \
-i scripts/input_data/few_events.hepmc \
-o derp.root -n 1 \
--ui csh --vis -b -m macro/dawn_picture.mac &
sleep 10
echo "sleeping 20 secs .. "
sleep 10
echo "sleeping 10 secs "
sleep 5
echo "sleeping 5 secs "
sleep 5
kill %1
sleep 10
echo "sleeping 20 secs .. "
sleep 10
echo "sleeping 10 secs "
sleep 5
echo "sleeping 5 secs "
sleep 5
kill %1
else
echo " Running simulation for tracks"
./scripts/run_topside.py -i scripts/input_data/few_events.hepmc \
./scripts/run_topside.py \
--compact ${DETECTOR_PATH}/topside.xml \
-i scripts/input_data/few_events.hepmc \
-o derp.root -s ${SKIP_EVENTS} -n 1 \
--ui csh --vis -b -m macro/dawn_picture2.mac &
......
......@@ -4,10 +4,14 @@ dawn_view_01:detector:
- ./bin/make_dawn_views -t view01 -d scripts/view1 -D
dawn_view_01:ev001:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view01_ev001 -d scripts/view1 -s 1
dawn_view_01:ev002:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view01_ev001 -d scripts/view1 -s 2
......@@ -16,7 +20,12 @@ view_01:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["dawn_view_01:detector", "dawn_view_01:ev001","dawn_view_01:ev002"]
- job: dawn_view_01:detector
optional: false
- job: dawn_view_01:ev001
optional: true
- job: dawn_view_01:ev002
optional: true
script:
- ls -lrth *
- ls -lrth images/*
......
......@@ -3,22 +3,32 @@ dawn_view_11:detector:
script:
- ./bin/make_dawn_views -t view11 -d scripts/view11 -D
dawn_view_11:ev000:
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
extends: .views
script:
- ./bin/make_dawn_views -t view11 -d scripts/view11
dawn_view_11:ev001:
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
extends: .views
script:
- ./bin/make_dawn_views -t view11 -d scripts/view11 -s 1
dawn_view_11:ev002:
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
extends: .views
script:
- ./bin/make_dawn_views -t view11 -d scripts/view11 -s 2
dawn_view_11:ev003:
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
extends: .views
script:
- ./bin/make_dawn_views -t view11 -d scripts/view11 -s 3
dawn_view_11:ev004:
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
extends: .views
script:
- ./bin/make_dawn_views -t view11 -d scripts/view11 -s 4
......@@ -28,7 +38,18 @@ view_11:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["dawn_view_11:detector","dawn_view_11:ev001","dawn_view_11:ev002", "dawn_view_11:ev003","dawn_view_11:ev004"]
- job: compile
optional: false
- job: dawn_view_11:detector
optional: false
- job: dawn_view_11:ev001
optional: true
- job: dawn_view_11:ev002
optional: true
- job: dawn_view_11:ev003
optional: true
- job: dawn_view_11:ev004
optional: true
script:
- ls -lrth *
- ls -lrth images/*
......
......@@ -8,10 +8,14 @@ dawn_view_02:detector:
# - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1
dawn_view_02:ev002:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
dawn_view_02:ev003:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view02_ev003 -d scripts/view2 -s 3
......@@ -20,7 +24,12 @@ view_02:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["dawn_view_02:detector", "dawn_view_02:ev002", "dawn_view_02:ev003"]
- job: dawn_view_02:detector
optional: false
- job: dawn_view_02:ev002
optional: true
- job: dawn_view_02:ev003
optional: true
#- ["dawn_view_02:detector", "dawn_view_02:ev001", "dawn_view_02:ev002", "dawn_view_02:ev003"]
script:
- ls -lrth *
......
......@@ -8,6 +8,8 @@ dawn_view_03:detector:
# - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1
dawn_view_03:ev002:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
......@@ -16,7 +18,10 @@ view_03:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["dawn_view_03:detector", "dawn_view_03:ev002"]
- job: dawn_view_03:detector
optional: false
- job: dawn_view_03:ev002
optional: true
#- ["dawn_view_03:detector", "dawn_view_03:ev001", "dawn_view_03:ev002"]
script:
- ls -lrth *
......
......@@ -8,14 +8,20 @@ dawn_view_06:detector:
# - ./bin/make_dawn_views -t view02_ev001 -d scripts/view2 -s 1
dawn_view_06:ev002:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view02_ev002 -d scripts/view2 -s 2
dawn_view_06:ev003:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view02_ev003 -d scripts/view2 -s 3
dawn_view_06:ev004:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view02_ev004 -d scripts/view2 -s 4
......@@ -24,7 +30,14 @@ view_06:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["dawn_view_06:detector", "dawn_view_06:ev002", "dawn_view_06:ev003", "dawn_view_06:ev004"]
- job: dawn_view_06:detector
optional: false
- job: dawn_view_06:ev002
optional: true
- job: dawn_view_06:ev003
optional: true
- job: dawn_view_06:ev004
optional: true
#- ["dawn_view_06:detector", "dawn_view_06:ev001", "dawn_view_06:ev002", "dawn_view_06:ev003", "dawn_view_06:ev004"]
script:
- ls -lrth *
......
......@@ -4,10 +4,14 @@ dawn_view_07:detector:
- ./bin/make_dawn_views -t view07 -d scripts/view2 -D
dawn_view_07:ev002:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view07_ev002 -d scripts/view2 -s 2
dawn_view_07:ev003:
extends: .views
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./bin/make_dawn_views -t view07_ev003 -d scripts/view2 -s 3
......@@ -16,7 +20,12 @@ view_07:
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
needs:
- ["dawn_view_07:detector", "dawn_view_07:ev002", "dawn_view_07:ev003"]
- job: dawn_view_07:detector
optional: false
- job: dawn_view_07:ev002
optional: true
- job: dawn_view_07:ev003
optional: true
script:
- ls -lrth *
- ls -lrth images/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment