more testing

.gitlab-ci.yml

@@ -21,48 +21,17 @@ stages:
 
 common:setup:
   stage: config
-  before_script:
-    - |
-      git clone -b "${COMMON_BENCH_VERSION:-master}" https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
   script:
-    - |
-      if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event"  || "$CI_COMMIT_BRANCH" == "main" ]]; then
-        echo "DETECTOR               = ${DETECTOR}"
-        echo "DETECTOR_CONFIG        = ${DETECTOR_CONFIG}"
-        echo "DETECTOR_VERSION       = ${DETECTOR_VERSION}"
-        echo "DETECTOR_REPOSITORYURL = ${DETECTOR_REPOSITORYURL}"
-        echo "DETECTOR=$DETECTOR" >> juggler.env
-        echo "DETECTOR_CONFIG=$DETECTOR_CONFIG" >> juggler.env
-        echo "DETECTOR_VERSION=$DETECTOR_VERSION" >> juggler.env
-        echo "DETECTOR_REPOSITORYURL=$DETECTOR_REPOSITORYURL" >> juggler.env
-        echo "DETECTOR_DEPLOY_TOKEN_USERNAME=${DEPLOY_TOKEN_USERNAME}" >> juggler.env
-        echo "DETECTOR_DEPLOY_TOKEN_PASSWORD=${DEPLOY_TOKEN_PASSWORD}" >> juggler.env
-        echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
-      else 
-        if [[ "${DETECTOR}" == "" ]] ; then
-          export DETECTOR="epic" 
-        fi
-        if [[ "${DETECTOR_CONFIG}" == "" ]] ; then
-          export DETECTOR_CONFIG="${DETECTOR}"
-        fi
-        if [[ "${DETECTOR_VERSION}" == "" ]] ; then
-          export DETECTOR_VERSION="main" 
-        fi
-        if [[ "${DETECTOR_REPOSITORYURL}" == "" ]] ; then
-          export DETECTOR_REPOSITORYURL="https://github.com/eic/${DETECTOR}"
-        fi
-        echo "DETECTOR               = ${DETECTOR}"
-        echo "DETECTOR_CONFIG        = ${DETECTOR_CONFIG}"
-        echo "DETECTOR_VERSION       = ${DETECTOR_VERSION}"
-        echo "DETECTOR_REPOSITORYURL = ${DETECTOR_REPOSITORYURL}"
-        echo "DETECTOR=$DETECTOR" >> juggler.env
-        echo "DETECTOR_CONFIG=$DETECTOR_CONFIG" >> juggler.env
-        echo "DETECTOR_VERSION=$DETECTOR_VERSION" >> juggler.env
-        echo "DETECTOR_REPOSITORYURL=$DETECTOR_REPOSITORYURL" >> juggler.env
-        echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
-      fi
+    - git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup
     - source setup/bin/env.sh && ./setup/bin/install_common.sh
 
+common:detector:
+  stage: initialize
+  needs: ["common:setup"]
+  script:
+    - source .local/bin/env.sh && build_detector.sh
+    - find .local/
+
 common:benchmarks:
   stage: initialize
   needs: ["common:setup"]
@@ -70,6 +39,16 @@ common:benchmarks:
     - git clone ${GITHUB_REPOSITORY} benchmarks
     - git -C benchmarks checkout ${GITHUB_REF}
 
+.det_benchmark:
+  image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
+  needs: ["common:setup"]
+  before_script:
+    - source .local/bin/env.sh
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+
 benchmarks:running:
   stage: running
   needs: ["common:benchmarks"]