Merging files

ci/setup_spack.sh

@@ -82,11 +82,13 @@ cp "${SPACK_SYSTEM_CONFIG_PATH}/mirrors.yaml" spack/etc/spack
 
 echo "Setting up packages"
 
-if [ ! -e ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml ]
+if [ -e ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml ]
 then
-  echo "packages:" > ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
+  mv ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml packages.yaml.old
 fi
 
+echo "packages:" > ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
+
 export system_compiler=$(jq -Mrc '
 .stack
  | .system_arch as $arch
@@ -102,6 +104,11 @@ jq -Mrc '
  | .[]
 ' ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
 
+if [ -e ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml.old ]
+then
+  yq '. *= load("packages.yaml.old")' ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
+fi
+
 cp "${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml" spack/etc/spack
 
 echo "Setting up extra repos"

dockerfiles/rhel9-kuma/Dockerfile

@@ -49,3 +49,5 @@ RUN yum install -y --enablerepo=$CUDA_REPO \
 RUN yum install -y --enablerepo=$GPFS_REPO \
     gpfs.base \
     && yum -y clean all && rm -fr /var/cache 
+
+RUN pip3 install yq