diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b8a1e19758e8476e07615012b07e8348e9287df..386324164bacc18ab35c0dafac6d1abe2024ac96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,12 +75,23 @@ detector_benchmarks: - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' needs: ["common:variables"] variables: - JUGGLER_DETECTOR: "athena" - JUGGLER_DETECTOR_CONFIG: "athena" + JUGGLER_DETECTOR: "ecce" + JUGGLER_DETECTOR_CONFIG: "ecce" COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION" trigger: project: EIC/benchmarks/detector_benchmarks strategy: depend + parallel: + matrix: + - JUGGLER_DETECTOR: 'athena' + JUGGLER_DETECTOR_CONFIG: 'athena' + JUGGLER_DETECTOR_VERSION: 'master' + - JUGGLER_DETECTOR: 'ecce' + JUGGLER_DETECTOR_CONFIG: 'ecce_imaging' + JUGGLER_DETECTOR_VERSION: 'main' + - JUGGLER_DETECTOR: 'ecce' + JUGGLER_DETECTOR_CONFIG: 'ecce_sciglass' + JUGGLER_DETECTOR_VERSION: 'main' pages: image: eicweb.phy.anl.gov:4567/containers/eic_container/alpine diff --git a/bin/env.sh b/bin/env.sh index 792b75684b3dc28d42dc3851043d9a928d644db7..d1a9312d322aee2ffcce0e73a25bbf4edf0a8e51 100755 --- a/bin/env.sh +++ b/bin/env.sh @@ -44,7 +44,7 @@ fi ## Detector package to be used during the benchmark process if [ ! -n "${JUGGLER_DETECTOR}" ] ; then - export JUGGLER_DETECTOR="athena" + export JUGGLER_DETECTOR="ecce" fi if [ ! -n "${JUGGLER_DETECTOR_CONFIG}" ] ; then @@ -52,7 +52,7 @@ if [ ! -n "${JUGGLER_DETECTOR_CONFIG}" ] ; then fi if [ ! -n "${JUGGLER_DETECTOR_VERSION}" ] ; then - export JUGGLER_DETECTOR_VERSION="master" + export JUGGLER_DETECTOR_VERSION="main" fi