Skip to content
Snippets Groups Projects
Commit ee3c1202 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

fixing upstream env vars

parent ce02a846
No related branches found
No related tags found
1 merge request!77fixing upstream env vars
...@@ -13,6 +13,9 @@ default: ...@@ -13,6 +13,9 @@ default:
- .local/share - .local/share
- results - results
- config - config
- juggler.env
reports:
dotenv: juggler.env
stages: stages:
- config - config
...@@ -29,6 +32,14 @@ common:setup: ...@@ -29,6 +32,14 @@ common:setup:
before_script: before_script:
- git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup - git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
script: script:
- |
if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event" || "$CI_COMMIT_BRANCH" == "master" ]]; then
export JUGGLER_DETECTOR_VERSION="${CI_COMMIT_REF_NAME}"
echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
echo "JUGGLER_DETECTOR_VERSION = ${CI_COMMIT_REF_NAME}"
echo "JUGGLER_DETECTOR_VERSION=$CI_COMMIT_REF_NAME" >> juggler.env
echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
fi
- source setup/bin/env.sh && ./setup/bin/install_common.sh - source setup/bin/env.sh && ./setup/bin/install_common.sh
common:detector: common:detector:
......
...@@ -9,6 +9,7 @@ sampling_ecal_electrons: ...@@ -9,6 +9,7 @@ sampling_ecal_electrons:
stage: run stage: run
script: script:
- bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_electrons -p "electron" - bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_electrons -p "electron"
allow_failure: true
sampling_ecal_photons: sampling_ecal_photons:
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
...@@ -21,6 +22,7 @@ sampling_ecal_photons: ...@@ -21,6 +22,7 @@ sampling_ecal_photons:
stage: run stage: run
script: script:
- bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_photons -p "photon" - bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_photons -p "photon"
allow_failure: true
sampling_ecal_pions: sampling_ecal_pions:
image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
...@@ -33,4 +35,5 @@ sampling_ecal_pions: ...@@ -33,4 +35,5 @@ sampling_ecal_pions:
stage: run stage: run
script: script:
- bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_pions -p "pion-" - bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_pions -p "pion-"
allow_failure: true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment