Correcting merge procedure with updated yq and jq

ci/setup_spack.sh

@@ -104,9 +104,11 @@ jq -Mrc '
  | .[]
 ' ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
 
-if [ -e ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml.old ]
+if [ -e packages.yaml.old ]
 then
-  yq '. *= load("packages.yaml.old")' ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
+  yq eval-all --inplace 'select(fileIndex==0) *+ select(fileIndex==1)' \
+    ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml packages.yaml.old
+  rm packages.yaml.old
 fi
 
 cp "${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml" spack/etc/spack

dockerfiles/rhel9-kuma/Dockerfile

@@ -24,7 +24,7 @@ RUN yum install -y --enablerepo=$APPSTREAM_REPO \
     python3 python3-pip python3-setuptools python3-boto3 \
     git subversion mercurial \
     glibc-gconv-extra \
-    jq squashfs-tools \
+    squashfs-tools \
     && yum -y clean all && rm -fr /var/cache 
 
 # stack dependencies
@@ -50,4 +50,11 @@ RUN yum install -y --enablerepo=$GPFS_REPO \
     gpfs.base \
     && yum -y clean all && rm -fr /var/cache 
 
-RUN pip3 install yq
+
+RUN curl -L -O https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
+    && mv jq-linux-amd64 /usr/local/bin/jq \
+    && chmod +x /usr/local/bin/jq
+
+RUN curl -L -O https://github.com/mikefarah/yq/releases/download/v4.44.2/yq_linux_amd64 \
+    && mv yq_linux_amd64 /usr/local/bin/yq \
+    && chmod +x /usr/local/bin/yq