Putting jed and helvatios in cloud to avoid the group problem

ci/stack_env.sh

@@ -13,11 +13,11 @@ export SPACK_SYSTEM_CONFIG_PATH=${STACK_LOCATION}/spack/var/spack/environments/$
 #export SPACK_USER_CACHE_PATH=$(mktemp -p /tmp -d slurm_user_cache_XXXXXXX)
 #export SPACK_USER_CONFIG_PATH=$(mktemp -p /tmp -d slurm_user_config_XXXXXXX)
 
-export environment_type="local_cluster"
 export SPACK_VERSION=$(jq -r .spack.version ${STACK_CONFIG})
 
 env_json=$(jq '.stack.environments | to_entries | .[] | select(.key == env.environment) | .value' ${STACK_CONFIG})
 
+export environment_type=$(echo $env_json | jq -Mrc '.type // "local_cluster"')
 export target=$(echo $env_json | jq -Mrc '.target')
 export accelerator=$(echo $env_json | jq -Mrc '.accelerator // "none"')
 
@@ -35,6 +35,14 @@ echo "SPACK_VERSION: ${SPACK_VERSION}"
 echo "MOUNT_POINT: ${MOUNT_POINT}"
 echo "STACK_LOCATION: ${STACK_LOCATION}"
 echo "SPACK_SYSTEM_CONFIG_PATH: ${SPACK_SYSTEM_CONFIG_PATH}"
+
+if [ "$accelerator" == "none" ]
+then
+    echo "{ \"target\": \"${target}\", \"type\": \"${environment_type}\", \"accelerator\": \"${accelerator}\" }" | jq .
+else
+    echo "{ \"target\": \"${target}\", \"type\": \"${environment_type}\", \"accelerator\": ${accelerator} }" | jq .
+fi
+
 # echo "SPACK_USER_CACHE_PATH: ${SPACK_USER_CACHE_PATH}"
 # echo "SPACK_USER_CONFIG_PATH: ${SPACK_USER_CONFIG_PATH}"
 

stacks/pinot-noir/config.json

@@ -36,7 +36,8 @@
         "environments": {
             "helvetios": {
                 "target": "skylake_avx512",
-                "accelerator": "none"
+                "accelerator": "none",
+                "type": "cloud"
             },
             "izar": {
                 "target": "cascadelake",
@@ -46,7 +47,8 @@
                 }
             },
             "jed": {
-                "target": "icelake"
+                "target": "icelake",
+                "type": "cloud"
             },
             "kuma-l40s": {
                 "target": "zen4",