fixing upstream env vars

.gitlab-ci.yml

@@ -13,6 +13,9 @@ default:
       - .local/share
       - results
       - config
+      - juggler.env
+    reports:
+      dotenv: juggler.env
 
 stages:
   - config
@@ -29,6 +32,14 @@ common:setup:
   before_script:
     - git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup 
   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
 
 common:detector:

benchmarks/sampling_ecal/config.yml

@@ -9,6 +9,7 @@ sampling_ecal_electrons:
   stage: run
   script:
     - bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_electrons -p "electron"
+  allow_failure: true
 
 sampling_ecal_photons:
   image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
@@ -21,6 +22,7 @@ sampling_ecal_photons:
   stage: run
   script:
     - bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_photons -p "photon"
+  allow_failure: true
 
 sampling_ecal_pions:
   image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
@@ -33,4 +35,5 @@ sampling_ecal_pions:
   stage: run
   script:
     - bash benchmarks/sampling_ecal/run_emcal_barrel.sh -n emcal_barrel_pions -p "pion-"
+  allow_failure: true