fix: set DETECTOR and DETECTOR_CONFIG in benchmark triggers

Fixes #123 (closed).

.gitlab-ci.yml

@@ -461,65 +461,10 @@ benchmarks:detector:default:
     BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
   trigger:
     project: EIC/benchmarks/detector_benchmarks
-    strategy: depend
-      #allow_failure: true
-  
-    #benchmarks:detector:nightly:
-    #  stage: benchmarks
-    #  rules:
-    #    - !reference ['.nightly', rules]
-    #  needs: 
-    #    - version
-    #    - jug_xl:nightly
-    #  variables:
-    #    DETECTOR: "${DETECTOR}"
-    #    DETECTOR_CONFIG: "${DETECTOR_CONFIG}"
-    #    DETECTOR_REPOSITORYURL: "${DETECTOR_REPOSITORYURL}"
-    #    BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
-    #    BENCHMARKS_CONTAINER: "jug_xl"
-    #    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
-    #  trigger:
-    #    project: EIC/benchmarks/detector_benchmarks
-    #    strategy: depend
-    #  allow_failure: true
-  
-
-benchmarks:reconstruction:default:
-  stage: benchmarks
-  needs: 
-    - version
-    - jug_xl:default
-  variables:
-    DETECTOR: "${DETECTOR}"
-    DETECTOR_CONFIG: "${DETECTOR_CONFIG}"
-    DETECTOR_REPOSITORYURL: "${DETECTOR_REPOSITORYURL}"
-    BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
-    BENCHMARKS_CONTAINER: "jug_xl"
-    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
-  trigger:
-    project: EIC/benchmarks/reconstruction_benchmarks
     strategy: depend
   allow_failure: true
   
-benchmarks:physics:default:
-  stage: benchmarks
-  needs: 
-    - version
-    - jug_xl:default
-  variables:
-    RECO: "eicrecon"
-    DETECTOR: "${DETECTOR}"
-    DETECTOR_CONFIG: "${DETECTOR_CONFIG}"
-    DETECTOR_REPOSITORYURL: "${DETECTOR_REPOSITORYURL}"
-    BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
-    BENCHMARKS_CONTAINER: "jug_xl"
-    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
-  trigger:
-    project: EIC/benchmarks/physics_benchmarks
-    strategy: depend
-  allow_failure: false
-
-benchmarks:reconstruction:nightly:
+benchmarks:detector:nightly:
   stage: benchmarks
   rules:
     - !reference ['.nightly', rules]
@@ -534,29 +479,84 @@ benchmarks:reconstruction:nightly:
     BENCHMARKS_CONTAINER: "jug_xl"
     BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
   trigger:
-    project: EIC/benchmarks/reconstruction_benchmarks
+    project: EIC/benchmarks/detector_benchmarks
     strategy: depend
   allow_failure: true
   
-benchmarks:physics:nightly:
-  stage: benchmarks
-  rules:
-    - !reference ['.nightly', rules]
-  needs: 
-    - version
-    - jug_xl:nightly
-  variables:
-    RECO: "eicrecon"
-    DETECTOR: "${DETECTOR}"
-    DETECTOR_CONFIG: "${DETECTOR_CONFIG}"
-    DETECTOR_REPOSITORYURL: "${DETECTOR_REPOSITORYURL}"
-    BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
-    BENCHMARKS_CONTAINER: "jug_xl"
-    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
-  trigger:
-    project: EIC/benchmarks/physics_benchmarks
-    strategy: depend
-  allow_failure: false
+
+    #benchmarks:reconstruction:default:
+    #  stage: benchmarks
+    #  needs: 
+    #    - version
+    #    - jug_xl:default
+    #  variables:
+    #    DETECTOR: "${DETECTOR}"
+    #    DETECTOR_CONFIG: "${DETECTOR_CONFIG}"
+    #    DETECTOR_REPOSITORYURL: "${DETECTOR_REPOSITORYURL}"
+    #    BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
+    #    BENCHMARKS_CONTAINER: "jug_xl"
+    #    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
+    #  trigger:
+    #    project: EIC/benchmarks/reconstruction_benchmarks
+    #    strategy: depend
+    #  allow_failure: true
+    #  
+    #benchmarks:physics:default:
+    #  stage: benchmarks
+    #  needs: 
+    #    - version
+    #    - jug_xl:default
+    #  variables:
+    #    RECO: "eicrecon"
+    #    DETECTOR: "${DETECTOR}"
+    #    DETECTOR_CONFIG: "${DETECTOR_CONFIG}"
+    #    DETECTOR_REPOSITORYURL: "${DETECTOR_REPOSITORYURL}"
+    #    BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
+    #    BENCHMARKS_CONTAINER: "jug_xl"
+    #    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
+    #  trigger:
+    #    project: EIC/benchmarks/physics_benchmarks
+    #    strategy: depend
+    #  allow_failure: false
+    #
+    #benchmarks:reconstruction:nightly:
+    #  stage: benchmarks
+    #  rules:
+    #    - !reference ['.nightly', rules]
+    #  needs: 
+    #    - version
+    #    - jug_xl:nightly
+    #  variables:
+    #    DETECTOR: "${DETECTOR}"
+    #    DETECTOR_CONFIG: "${DETECTOR_CONFIG}"
+    #    DETECTOR_REPOSITORYURL: "${DETECTOR_REPOSITORYURL}"
+    #    BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
+    #    BENCHMARKS_CONTAINER: "jug_xl"
+    #    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
+    #  trigger:
+    #    project: EIC/benchmarks/reconstruction_benchmarks
+    #    strategy: depend
+    #  allow_failure: true
+    #  
+    #benchmarks:physics:nightly:
+    #  stage: benchmarks
+    #  rules:
+    #    - !reference ['.nightly', rules]
+    #  needs: 
+    #    - version
+    #    - jug_xl:nightly
+    #  variables:
+    #    RECO: "eicrecon"
+    #    DETECTOR: "${DETECTOR}"
+    #    DETECTOR_CONFIG: "${DETECTOR_CONFIG}"
+    #    DETECTOR_REPOSITORYURL: "${DETECTOR_REPOSITORYURL}"
+    #    BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
+    #    BENCHMARKS_CONTAINER: "jug_xl"
+    #    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
+    #  trigger:
+    #    project: EIC/benchmarks/physics_benchmarks
+    #    strategy: depend
+    #  allow_failure: false
 
 clean_internal_tag:
   image: alpine/curl
@@ -564,6 +564,7 @@ clean_internal_tag:
   needs:
     - version
     - benchmarks:detector:default
+    - benchmarks:detector:nightly
   when: always
   script:
     - |
@@ -579,6 +580,7 @@ clean_unstable_mr:
   needs:
     - version
     - benchmarks:detector:default
+    - benchmarks:detector:nightly
   tags:
     - docker-new
   when: always