Master

build-executor/utility.sh

@@ -219,7 +219,11 @@ function openMR_create_new_branch(){
 
 function openMR_update_WL_list(){
     echo "[openMR] update file WL_list.md"
-    generate_wl_list > /WL_list.md
+    ls -l $CI_PROJECT_DIR/x86_image_folder_dump.txt
+    #cat $CI_PROJECT_DIR/x86_image_folder_dump.txt
+    total_size=$(cat $CI_PROJECT_DIR/x86_image_folder_dump.txt | grep -i total | tail -1 | awk '{print $1}')
+    echo "[openMR] Retrieved container total size: ${total_size}"
+    generate_wl_list ${total_size} > /WL_list.md
     cat /WL_list.md
 
     curl -i --request PUT \
@@ -471,6 +475,7 @@ function test_singularity_from_registry(){
         rm -f ${theimage}.sif; 
         fail "[test_singularity_from_registry] Run WL in singularity"; 
     fi
+     execute_command_retry singularity run $USEGPU -B ${CIENV_JOBDIR}/results:/results ${theimage} $HEPWL_BMKOPTS -h > x86_image_folder_dump.txt
     echo "[test_singularity_from_registry] finished at $(date)"
     echo -e "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
     echo -e "\n[utility.sh] ${FUNCNAME[0]} finished at $(date)\n"
@@ -554,10 +559,33 @@ function create_sing_cache_dirs(){
 }
 
 function generate_wl_list(){
+    this_wl_size=$1
+
     echo "# HEP Workloads list"
+    echo '''
+
+## To run
+
+* Docker
+
+```
+docker run -v /path/to/local/folder:/results $DOCKER_IMAGE:latest
+```
+* Apptainer/Singularity
+
+```
+chmod a+rw /path/to/local/folder
+apptainer run -B /path/to/local/folder:/results $SIF_IMAGE:latest_$arch
+```
+where:
+ * arch=x86_64 or arch=aarch64
+ * DOCKER_IMAGE and SIF_IMAGE path can be found in the below table, columns SIF/Docker image registry
+
+'''
+
     LONG_STRING=""
-    echo "| Experiment |  WL repo  | SIF Containers | Latest Docker Container | Lastest Built Version | Latest Pipeline status | "
-    echo "| -------- | -------- | -------- | -------- | -------- | -------- |"
+    echo "| Experiment |  WL repo  | SIF image registry | Docker image registry| Latest Built Version | Latest Pipeline status | Unpacked container size | "
+    echo "| -------- | -------- | -------- | -------- | -------- | -------- | -------- |"
     EXPERIMENTS=$(find . -mindepth 1 -maxdepth 1 -type d | sed -e 's@\.\/@@' | grep -E -v "common|build-executor|scripts|test|\..*" | sort )
     for aexp in ${EXPERIMENTS};
     do
@@ -565,18 +593,21 @@ function generate_wl_list(){
         for wl in $WORKLOADS;
         do
             source "${aexp}/${wl}/${aexp}-${wl}.spec"
-            echo "| $aexp | [$wl][${aexp}_${wl}_code] | [link][${aexp}_${wl}_sif] | [docker][${aexp}_${wl}_img] | [${HEPWL_DOCKERIMAGETAG}][${aexp}_${wl}_pipelink] | ![ci][${aexp}_${wl}_pipeline]|"
             pipeline_url=""
+            wl_size=""
             if [ -f "${CI_PROJECT_DIR}"/WL_list.md ]; then
     	        pipeline_url=$( (grep "\[${aexp}_${wl}_pipelink\]:" "${CI_PROJECT_DIR}"/WL_list.md || echo ":") | cut -d ":" -f2- | sed -e 's@\s@@g')
+                wl_size=$(cat "${CI_PROJECT_DIR}"/WL_list.md | grep "\[$wl\]\[${aexp}_${wl}_code\] " | awk -F'|' '{print $8}')
             fi
             if [ "${CI_COMMIT_BRANCH}" == "qa-build-${aexp}-${wl}" ]; then
                 pipeline_url="https://gitlab.cern.ch/hep-benchmarks/hep-workloads/-/pipelines/${CI_PIPELINE_ID}"
+                wl_size=${this_wl_size}
             fi
+            echo "| $aexp | [$wl][${aexp}_${wl}_code] | [click for link][${aexp}_${wl}_sif] | [click for link][${aexp}_${wl}_img] | [${HEPWL_DOCKERIMAGETAG}][${aexp}_${wl}_pipelink] | ![ci][${aexp}_${wl}_pipeline]| ${wl_size} |"
             LONG_STRING="$LONG_STRING
                 [${aexp}_${wl}_code]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/-/blob/master/${aexp}/${wl}/${aexp}-${wl}
                 [${aexp}_${wl}_sif]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads-sif/container_registry/?search%5B%5D=${aexp}-${wl}-bmk
-                [${aexp}_${wl}_img]: docker://gitlab-registry.cern.ch/hep-benchmarks/hep-workloads/${aexp}-${wl}-bmk:latest
+                [${aexp}_${wl}_img]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/container_registry/?search%5B%5D=${aexp}-${wl}-bmk
                 [${aexp}_${wl}_pipelink]: ${pipeline_url}
                 [${aexp}_${wl}_pipeline]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/badges/qa-build-${aexp}-${wl}/pipeline.svg
                 "