feat: use BUILD_IMAGE=eic_ with rename to jug instead of other way around; fix NIGHLTY

.gitlab-ci.yml

@@ -44,7 +44,7 @@ stages:
   - status-pending
   - config
   - base            ## base OS image
-  - jug             ## jug container images
+  - eic             ## EIC container images
   - deploy          ## build/deploy singularity images
   - benchmarks
   - test
@@ -280,7 +280,7 @@ base:
       done
 
 
-jug_xl:
+eic:
   parallel:
     matrix:
       - BUILD_TYPE:
@@ -310,7 +310,7 @@ jug_xl:
 #        ENV:
 #        - prod
   extends: .build
-  stage: jug
+  stage: eic
   needs:
     - version
     - base
@@ -331,6 +331,7 @@ jug_xl:
     - while !
       docker buildx build --push ${BUILD_OPTIONS}
                    --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE}
+                   --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE/eic/jug}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE}
                    ${EXPORT_TAG:+
                      ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${EXPORT_TAG}-${BUILD_TYPE}}
                      ${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}${ENV}:${EXPORT_TAG}-${BUILD_TYPE}}
@@ -431,7 +432,7 @@ jug_xl:singularity:default:
     BUILD_IMAGE: jug_xl
   needs:
     - version
-    - jug_xl
+    - eic
 
 # eic-shell expects build/jug_xl.sif from the job with name 'jug_xl:singularity:nightly'
 jug_xl:singularity:nightly:
@@ -441,46 +442,58 @@ jug_xl:singularity:nightly:
     BUILD_IMAGE: jug_xl
   needs:
     - version
-    - jug_xl
+    - eic
 
 
-benchmarks:detector:default:
+.benchmarks:
   stage: benchmarks
   needs: 
     - version
-    - jug_xl
+    - eic
   variables:
     DETECTOR: "epic"
     DETECTOR_CONFIG: epic_craterlake
     DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
-    BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
-    BENCHMARKS_CONTAINER: "jug_xl"
+    BENCHMARKS_CONTAINER: "eic_xl"
     BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
     PIPELINE_NAME: "$PIPELINE_NAME"
+  allow_failure: false
+
+benchmarks:detector:default:
+  extends: .benchmarks
+  variables:
+    BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
   trigger:
     project: EIC/benchmarks/detector_benchmarks
     strategy: depend
-  allow_failure: false
   
 benchmarks:detector:nightly:
-  stage: benchmarks
+  extends: .benchmarks
   rules:
     - !reference ['.nightly', rules]
-  needs: 
-    - version
-    - jug_xl
   variables:
-    DETECTOR: "epic"
-    DETECTOR_CONFIG: epic_craterlake
-    DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
     BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
-    BENCHMARKS_CONTAINER: "jug_xl"
-    BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
-    PIPELINE_NAME: "$PIPELINE_NAME"
   trigger:
     project: EIC/benchmarks/detector_benchmarks
     strategy: depend
-  allow_failure: false
+
+benchmarks:phyiscs:default:
+  extends: .benchmarks
+  variables:
+    BENCHMARKS_TAG: "${INTERNAL_TAG}-default"
+  trigger:
+    project: EIC/benchmarks/physics_benchmarks
+    strategy: depend
+
+benchmarks:physics:nightly:
+  extends: .benchmarks
+  rules:
+    - !reference ['.nightly', rules]
+  variables:
+    BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly"
+  trigger:
+    project: EIC/benchmarks/physics_benchmarks
+    strategy: depend
 
 df:
   extends: .build
@@ -528,7 +541,8 @@ prune:
 clean_internal_tag:
   image: alpine/curl
   stage: finalize
-  when: always
+  rules:
+    - when: manual
   script:
     - |
       for id in 66 68 69 80 83 91 92 97 ; do
@@ -584,7 +598,7 @@ clean_pipeline:
       ; do 
         docker images
           --filter=reference=${registry}/*:pipeline-*
-          --format "{{.ID}} {{.Repository}} {{.Tag}}" ;
+          --format "{{.ID}} {{.Repository}} {{.Tag}} {{.CreatedSince}}" ;
       done
     - for registry in
         eicweb
@@ -592,11 +606,12 @@ clean_pipeline:
       ; do 
         docker images 
           --filter=reference=${registry}/*:pipeline-*
-          --format "{{.ID}} {{.Repository}} {{.Tag}}" ;
+          --format "{{.ID}} {{.Repository}} {{.Tag}} {{.CreatedSince}}" ;
       done
       | grep -v ${CI_PIPELINE_ID}
-      | sed -n -E 's/pipeline-([0-9]+)(-.*){0,1}$/& \1/p'
-      | while read id repository tag pipeline_id ; do
+      | grep -v "hours ago"
+      | sed -n -E 's/pipeline-([0-9]+)(-.*){0,1}\s+.*$/\1 &/p'
+      | while read id repository pipeline_id tag N durations ago ; do
         echo "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${pipeline_id}" ;
         curl --silent -L "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${pipeline_id}" | jq . ;
         status=$(curl --silent -L