diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5684d21498db229d8342d49f96b50251e246e208..d933905fb54b184021e76a06740d35cd51e30bf6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,11 @@ image: ${BENCHMARKS_REGISTRY}/${BENCHMARKS_CONTAINER}:${BENCHMARKS_TAG} default: before_script: - - source .local/bin/env.sh + - if [ -f .local/bin/env.sh ] ; then + source .local/bin/env.sh ; + source /opt/detector/epic-main/bin/thisepic.sh ; + export configs=$(ls -1 ${DETECTOR_PATH} | sed '/epic_.*\.xml$/!d;s/^epic_\(.*\).xml/\1/g' | xargs) ; + fi interruptible: true artifacts: expire_in: 3 days @@ -27,12 +31,10 @@ stages: - status-report .status: - image: curlimages/curl:latest - before_script: [] script: - | if [ -n "${GITHUB_SHA}" ] ; then - for config in ${DETECTOR_CONFIG//,/ } ; do + for config in ${configs} ; do echo ${config} ; curl \ -X POST \ @@ -75,9 +77,6 @@ common:setup: .geoviewer: needs: - ["common:setup"] - before_script: - - source .local/bin/env.sh - - source /opt/detector/epic-main/setup.sh retry: max: 2 when: @@ -92,9 +91,9 @@ convert: script: - mkdir -p geo - | - for config in ${DETECTOR_CONFIG//,/ } ; do + for config in ${configs} ; do echo ${config} ; - dd_web_display --output geo/${config}.root ${DETECTOR_PATH}/${config}.xml + dd_web_display --output geo/${config}.root ${DETECTOR_PATH}/epic_${config}.xml done ; echo "TARGET_URL=https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/benchmarks/geoviewer/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/%config%.root?job=convert&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY320;ROTZ340;trz0;trr0;ctrl;all" | tee -a .env