Test Fix 6.2

Add apt lock timeouts to prevent builder and oneapi stages from
clashing.

containers/oneapi/onedev.Dockerfile

@@ -15,14 +15,14 @@ ARG INTERNAL_TAG="unstable-mr-290-306"
 FROM ${DOCKER_REGISTRY}debian_stable_base:${INTERNAL_TAG} as builder
 
 ## Install some extra spack dependencies
-RUN --mount=type=cache,target=/var/cache/apt                            \
-    rm -f /etc/apt/apt.conf.d/docker-clean                              \
- && apt-get -yqq update                                                 \
- && apt-get -yqq install --no-install-recommends                        \
-        python3                                                         \
-        python3-dev                                                     \
-        python3-distutils                                               \
-        python-is-python3                                               \
+RUN --mount=type=cache,target=/var/cache/apt                               \
+    rm -f /etc/apt/apt.conf.d/docker-clean                                 \
+ && apt-get -yqq update                                                    \
+ && apt-get -yqq install --no-install-recommends -o DPkg::Lock::Timeout=-1 \
+        python3                                                            \
+        python3-dev                                                        \
+        python3-distutils                                                  \
+        python-is-python3                                                  \
  && rm -rf /var/lib/apt/lists/*
 
 
@@ -249,7 +249,7 @@ RUN --mount=type=cache,target=/var/cache/apt                            \
  && echo "US/Eastern" > /etc/timezone                                   \
  && apt-get -yqq update                                                 \
  && apt-get -yqq upgrade                                                \
- && apt-get -yqq install --no-install-recommends                        \
+ && apt-get -yqq install --no-install-recommends -o DPkg::Lock::Timeout=-1\
         bc                                                              \
         ca-certificates                                                 \
         clang-format                                                    \