From 29d8feb27fe4b85fa7ef3f3cb6c8b8de99f43195 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 2 Jul 2022 01:51:16 +0000
Subject: [PATCH] Submit both ecce:main and athena:master triggers
---
.gitlab-ci.yml | 15 +++++++++++++--
bin/env.sh | 4 ++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b8a1e1..3863241 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 792b756..d1a9312 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
--
GitLab