Stop running slow ARM tests and clean out images before caching

.gitlab-ci.yml

@@ -178,9 +178,10 @@ production-build-job:
     - docker buildx build --cache-from type=local,src=${HOME}/docker-cache --cache-to type=inline --platform="${PLATFORMS}" --build-arg THREADS=8 --target run -t ${CI_REPO}:${DOCKER_TAG} -f Dockerfile --push .
     # Tag it latest if we pushed a real release tag
     - if [[ ! -z "${CI_COMMIT_TAG}" ]]; then --cache-from type=local,src=${HOME}/docker-cache --cache-to type=inline --platform="${PLATFORMS}" --build-arg THREADS=8 --target run -t ${CI_REPO}:latest -f Dockerfile --push .; fi
-    # Also run the ARM tests (emulated!)
-    # But don't fail if they fail yet, because they don't yet actually work.
-    - docker buildx build --platform=linux/arm64 --build-arg THREADS=8 --target test -f Dockerfile . || true
+    # If we wanted to run the tests under ARM emulation, we could do:
+    #   docker buildx build --platform=linux/arm64 --build-arg THREADS=8 --target test -f Dockerfile .
+    # But we don't, because they both don't actually pass yet on ARM and also
+    # manage to hit a 6 hour timeout on our extremely slow emulators.
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
 
@@ -211,8 +212,12 @@ test-job:
     - stopdocker || true
     - rm -f /var/run/docker.sock
     - startdocker || true
+    # Don't leave containers in the cache
+    - docker ps -q -a | xargs docker rm -f || true
     # Don't leave each run's CI image laying around in the cache
     - docker rmi "quay.io/vgteam/vg:ci-${CI_PIPELINE_IID}-${CI_COMMIT_SHA}" vgci-docker-vg-local
+    # Show what we are caching
+    - docker images
     - stopdocker || true
 
   artifacts: