[pull] main from google:main

e2etests/MODULE.bazel

@@ -1,10 +1,10 @@
 bazel_dep(name = "rules_cc", version = "0.1.1")
-bazel_dep(name = "rules_shell", version = "0.4.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 
 git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "aosp_artifact",
-    commit = "385f9fae2a213ebb285d8a1a8dd041b1f92e6102",
+    commit = "9479ec22e5f0f12d55873c56980be5aad6fc2c75",
     remote = "https://github.com/google/android-cuttlefish.git",
     strip_prefix = "e2etests/orchestration/artifacts",
 )

e2etests/cvdr/cvdr_create_with_local_srcs_test.sh

@@ -4,12 +4,12 @@ set -e -x
 source ${TEST_SRCDIR}/_main/cvdr/common_utils.sh
 validate_components
 
-CVD_HOST_PKG=${TEST_SRCDIR}/+_repo_rules+aosp_artifact/cvd-host_package.tar.gz
+CVD_HOST_PKG="${TEST_SRCDIR}/+git_repository+aosp_artifact/cvd-host_package.tar.gz"
 if [ ! -f ${CVD_HOST_PKG} ]; then
     echo "Cannot find CVD host package from ${CVD_HOST_PKG}"
     exit 1
 fi
-IMAGE_ZIP=${TEST_SRCDIR}/+_repo_rules+aosp_artifact/images.zip
+IMAGE_ZIP="${TEST_SRCDIR}/+git_repository+aosp_artifact/images.zip"
 if [ ! -f "${IMAGE_ZIP}" ]; then
     echo "Cannot find image zip file from ${IMAGE_ZIP}"
     exit 1

pkg/app/instances/docker.go

@@ -35,6 +35,7 @@ import (
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/client"
+	"github.com/docker/docker/errdefs"
 )
 
 const DockerIMType IMType = "docker"
@@ -470,6 +471,12 @@ func (m *DockerInstanceManager) deleteDockerVolumeIfNeeded(ctx context.Context,
 	}
 	for _, volume := range volumeListRes.Volumes {
 		if err := m.Client.VolumeRemove(ctx, volume.Name, true); err != nil {
+			if errdefs.IsConflict(err) {
+				// Bypass conflict error when the volume is in use, as there's
+				// a race for deleting volume when deleting multiple hosts
+				// simultaneously.
+				continue
+			}
 			return fmt.Errorf("failed to remove docker volume: %w", err)
 		}
 	}