lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-08-29 03:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix BuilderStart race, parallelize container build tests. (#2002)

Browse Source 
- Closes #2001.
- Handle "container exists" error gracefully instead
  of failing, when trying to start the buildkit container.
- Move build tests to parallel suites, while the builder
  lifecycle tests remain serial. Parallel builds don't
  use the fixture lock that deletes and restarts the
  builder and runs a build block in isolation.
This commit is contained in:
J Logan
2026-07-23 15:50:59 -07:00
committed by GitHub
parent 78e2cb4417
commit d1d763530d
13 changed files with 1470 additions and 1596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/ContainerTestSupport/BuildFixture.swift
-36
View File
@@ -94,42 +94,6 @@ extension ContainerFixture {
}
throw CommandError.executionFailed("timed out waiting for container-builder-shim on buildkit")
}
/// Deletes any existing builder, starts a fresh one, runs `body`, then deletes the builder.
///
/// Each build test gets an isolated builder to avoid inter-test contamination.
/// Acquires a process-wide lock so only one test holds the buildkit singleton at a time,
/// regardless of how many suites run concurrently in the global pass.
public func withBuilder(
cpus: Int64 = 2,
memoryInGBs: Int64 = 2,
_ body: @Sendable (ContainerFixture) async throws -> Void
) async throws {
try await withoutActuallyEscaping(body) { escapingBody in
try await Self.builderLock.withLock { _ in
_ = try? self.run(["builder", "delete", "--force"])
try self.builderStart(cpus: cpus, memoryInGBs: memoryInGBs)
defer { _ = try? self.run(["builder", "delete", "--force"]) }
try await self.waitForBuilderRunning()
try await escapingBody(self)
}
}
}
/// Acquires the process-wide builder lock without starting a builder.
///
/// Use this in tests that manually manage the builder lifecycle (e.g. lifecycle
/// tests that call ``builderStart()``/``builderStop()`` directly) so they
/// serialise correctly with tests that use ``withBuilder(_:)``.
public func withBuilderLock<T: Sendable>(_ body: @Sendable () async throws -> T) async throws -> T {
try await withoutActuallyEscaping(body) { escapingBody in
try await Self.builderLock.withLock { _ in
try await escapingBody()
}
}
}
private static let builderLock = AsyncLock()
}
// MARK: - Build context helpers