moving variable around

.gitlab-ci.yml

@@ -18,7 +18,6 @@ workflow:
 
 variables:
   TERM: ansi
-  CI_DATA_LT: "/work/scitas-ge/scitas-stack/ci"
 
 .parallel_definition:
   parallel:
@@ -55,6 +54,10 @@ variables:
     - stack
   variables:
     environment: ${environment}
+    CI_DATA_ST: "/scratch/${path_suffix}scitas-stack/ci"
+    CI_DATA_LT: "/work/scitas-ge/scitas-stack/ci"
+    COMMAND_OPTIONS_SBATCH: ${slurm_options}
+    PYTHONUNBUFFERED: 1
   image: ${app_image}
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
@@ -75,10 +78,8 @@ variables:
     - .parallel_definition
     - .squashfs_var
   variables:
-    CI_DATA_ST: "/scratch/${path_suffix}scitas-stack/ci"
-    MOUNT_POINT: $(jq -Mrc .stack.mount_point ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
     FAKEHOME: "${CI_DATA_ST}/homes"
-    COMMAND_OPTIONS_SBATCH: ${slurm_options}
+    MOUNT_POINT: $(jq -Mrc .stack.mount_point ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
     STACK_VERSION: $(jq -Mrc .stack.version ${CI_PROJECT_DIR}/stacks/${stack}/config.json)
     image_name: ${stack}-${environment}-${SQUASHFS_ID}-${CI_PIPELINE_ID}
     squashfs_image: $(ls -t1 ${CI_DATA_LT}/squashfs-cache/${image_name}*.sqfs 2> /dev/null | head -1)
@@ -86,7 +87,6 @@ variables:
       ${apptainer_options}
          --cleanenv
          -H $(mktemp -d -p ${FAKEHOME}/):/home/$(id -un)
-         --env PYTHONUNBUFFERED=1
          --bind ${CI_DATA_LT}/buildcache:${MOUNT_POINT}/buildcache
          --bind ${CI_DATA_LT}/spack-mirror:${MOUNT_POINT}/spack-mirror
          --bind ${CI_DATA_LT}/squashfs-cache/:/squashfs-cache
@@ -99,8 +99,6 @@ variables:
 spack:checkout:
   stage: .pre
   variables:
-    CI_DATA_ST: "/scratch/${path_suffix}scitas-stack/ci"
-    COMMAND_OPTIONS_SBATCH: ${slurm_options}
     APPTAINER_EXEC_OPTIONS: >-
       --cleanenv
       --bind ${CI_DATA_LT}

ci/stack_env.sh

@@ -26,7 +26,7 @@ then
     export acc_type=$(echo $env_json | jq -Mrc '.accelerator.type')
     export acc_arch=$(echo $env_json | jq -Mrc '.accelerator.arch')
 else
-    export acc_arch="none"
+    export acc_type="none"
 fi
 
 echo "STACK_CONFIG_PATH: ${STACK_CONFIG_PATH}"