eScience updates (#31)

* Revert "Updates eScience infrastructure to just use HPCIC images (#30)"

This reverts commit a154f12.

* update benchpark version

* update tags

Author: slabasan

2025-eScience/docker/Dockerfile.benchpark

@@ -6,7 +6,7 @@
 # For testing
 # FROM test-thicket
 
-FROM ghcr.io/llnl/thicket:hpcic-2025
+FROM ghcr.io/llnl/thicket:escience-2025
 
 USER root
 
@@ -32,7 +32,7 @@ USER ${NB_USER}
 
 RUN git clone https://github.com/LLNL/benchpark.git ${HOME}/benchpark && \
     cd ${HOME}/benchpark && \
-    git checkout -b develop-2025-08-25 develop-2025-08-25 && \
+    git checkout -b develop-2025-09-10 develop-2025-09-10 && \
     git submodule update --init --recursive
 
 USER root

2025-eScience/docker/Dockerfile.spawn

@@ -6,7 +6,7 @@
 # For testing
 # FROM test-benchpark
 
-FROM ghcr.io/llnl/benchpark:hpcic-2025
+FROM ghcr.io/llnl/benchpark:escience-2025
 
 USER root
 

2025-eScience/infrastructure/dry-run/config.toml

@@ -39,15 +39,15 @@ use_nginx = true
 hub_container_image = "jupyterhub/k8s-hub"
 hub_container_tag = "4.2.0"
 spawner_container_image = "ghcr.io/llnl/reproducible-benchmarking-spawn"
-spawner_container_tag = "hpcic-2025"
+spawner_container_tag = "escience-2025"
 spawner_image_entrypoint = "/entrypoint.sh 32"
 cpu_min = "32"
 cpu_max = "32"
 mem_min = "64G"
 mem_max = "64G"
 provide_extra_shmem = true
 init_container_image = "ghcr.io/llnl/reproducible-benchmarking-init"
-init_container_tag = "hpcic-2025"
+init_container_tag = "escience-2025"
 init_image_entrypoint = "/entrypoint.sh"
 
 [aws."utility scripts"]

2025-eScience/infrastructure/dry-run/helm-config.yaml

@@ -64,7 +64,7 @@ singleuser:
   #   5) Copy any necessary local scripts or files and ensure proper permissions
   image:
     name: ghcr.io/llnl/reproducible-benchmarking-spawn
-    tag: "hpcic-2025"
+    tag: "escience-2025"
     pullPolicy: Always
   # Specify the minimum (i.e., guarantee) and maximum (i.e., limit) amount of resources per user
   cpu:
@@ -106,7 +106,7 @@ singleuser:
   #    chown -R 1000 /home/jovyan
   initContainers:
     - name: init-tutorial-service
-      image: ghcr.io/llnl/reproducible-benchmarking-init:hpcic-2025
+      image: ghcr.io/llnl/reproducible-benchmarking-init:escience-2025
       command: ["/entrypoint.sh"]
       imagePullPolicy: Always
   storage:

2025-eScience/infrastructure/production/config.toml

@@ -39,15 +39,15 @@ use_nginx = true
 hub_container_image = "jupyterhub/k8s-hub"
 hub_container_tag = "4.2.0"
 spawner_container_image = "ghcr.io/llnl/reproducible-benchmarking-spawn"
-spawner_container_tag = "hpcic-2025"
+spawner_container_tag = "escience-2025"
 spawner_image_entrypoint = "/entrypoint.sh 32"
 cpu_min = "32"
 cpu_max = "32"
 mem_min = "64G"
 mem_max = "64G"
 provide_extra_shmem = true
 init_container_image = "ghcr.io/llnl/reproducible-benchmarking-init"
-init_container_tag = "hpcic-2025"
+init_container_tag = "escience-2025"
 init_image_entrypoint = "/entrypoint.sh"
 
 [aws."utility scripts"]

2025-eScience/infrastructure/production/helm-config.yaml

@@ -64,7 +64,7 @@ singleuser:
   #   5) Copy any necessary local scripts or files and ensure proper permissions
   image:
     name: ghcr.io/llnl/reproducible-benchmarking-spawn
-    tag: "hpcic-2025"
+    tag: "escience-2025"
     pullPolicy: Always
   # Specify the minimum (i.e., guarantee) and maximum (i.e., limit) amount of resources per user
   cpu:
@@ -106,7 +106,7 @@ singleuser:
   #    chown -R 1000 /home/jovyan
   initContainers:
     - name: init-tutorial-service
-      image: ghcr.io/llnl/reproducible-benchmarking-init:hpcic-2025
+      image: ghcr.io/llnl/reproducible-benchmarking-init:escience-2025
       command: ["/entrypoint.sh"]
       imagePullPolicy: Always
   storage: