Migrate some container tests, remove concurrent demo tests. (apple#1840)

- Part of apple#1833.
- Tweaks `ContainerFixture.withContainer()` to support the legacy
`longRun()` pattern without boilerplate.

Author: jglogan

Makefile

@@ -200,19 +200,32 @@ endef
 # the three phases. Expand the filter lists as suites are migrated from CLITests.
 PARALLEL_WIDTH ?= 2
 WARMUP_FILTER = ImageWarmup
-CONCURRENT_FILTER = DemoConcurrentTests
+
+CONCURRENT_TEST_SUITES ?= \
+	TestCLIStop \
+	TestCLIRmRaceCondition \
+	TestCLIExportCommand
+CONCURRENT_FILTER = $(subst $(space),|,$(strip $(CONCURRENT_TEST_SUITES)))
+
 GLOBAL_FILTER = DemoGlobalTests
 
 INTEGRATION_SWIFT_EXTRA ?=
 INTEGRATION_POST_TEST ?=
 
+PRESERVE_KERNELS ?= false
+
 define RUN_INTEGRATION
 	@echo Ensuring apiserver stopped before the CLI integration tests...
 	@bin/container system stop && sleep 3 && scripts/ensure-container-stopped.sh
 	@if [ -n "$(APP_ROOT)" ]; then \
-		echo "Clearing application data under $(APP_ROOT) (preserving kernels)..." ; \
 		mkdir -p $(APP_ROOT) ; \
-		find "$(APP_ROOT)" -mindepth 1 -maxdepth 1 ! -name kernels -exec rm -rf {} + ; \
+		if [ "$(PRESERVE_KERNELS)" = "true" ]; then \
+			echo "Clearing application data under $(APP_ROOT) (preserving kernels)..." ; \
+			find "$(APP_ROOT)" -mindepth 1 -maxdepth 1 ! -name kernels -exec rm -rf {} + ; \
+		else \
+			echo "Clearing application data under $(APP_ROOT)..." ; \
+			find "$(APP_ROOT)" -mindepth 1 -maxdepth 1 -exec rm -rf {} + ; \
+		fi ; \
 	fi
 	@echo Running the integration tests...
 	@bin/container --debug system start --timeout 60 --enable-kernel-install $(SYSTEM_START_OPTS) && \
@@ -263,7 +276,6 @@ INTEGRATION_TEST_SUITES ?= \
 	TestCLIRunBase \
 	TestCLIRunInitImage \
 	TestCLIBuildBase \
-	TestCLIExportCommand \
 	TestCLIVolumes \
 	TestCLIKernelSet \
 	TestCLIAnonymousVolumes \

Package.swift

@@ -85,7 +85,10 @@ let package = Package(
             dependencies: [
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "SystemPackage", package: "swift-system"),
+                .product(name: "ContainerizationArchive", package: "containerization"),
+                .product(name: "ContainerizationExtras", package: "containerization"),
                 "ContainerLog",
+                "ContainerResource",
                 "Yams",
             ],
             path: "Tests/IntegrationTests"

Tests/CLITests/Subcommands/Containers/TestCLIExport.swift

@@ -0,0 +1,55 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2026 Apple Inc. and the container project authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+import ContainerizationArchive
+import Foundation
+import Testing
+
+@Suite
+struct TestCLIExportCommand {
+    @Test func testExportCommand() async throws {
+        try await ContainerFixture.with { f in
+            let image = try f.copyWarmupImage(ContainerFixture.warmupImages[0])
+            try await f.withContainer(image: image, autoRemove: false) { name in
+                let mustBeInImage = "must-be-in-image"
+                try f.doExec(name, cmd: ["sh", "-c", "echo \(mustBeInImage) > /foo"])
+                try f.doExec(name, cmd: ["sh", "-c", "mkdir -p /parent/child"])
+                let hardlinkMustRemain = "hardlink-must-remain"
+                try f.doExec(name, cmd: ["sh", "-c", "echo \(hardlinkMustRemain) > /parent/child/bar"])
+                try f.doExec(name, cmd: ["sh", "-c", "ln /parent/child/bar /bar"])
+                let symlinkMustRemain = "symlink-must-remain"
+                try f.doExec(name, cmd: ["sh", "-c", "echo \(symlinkMustRemain) > /parent/child/baz"])
+                try f.doExec(name, cmd: ["sh", "-c", "ln /parent/child/baz /baz"])
+
+                try f.doStop(name)
+
+                let exportPath = f.testDir.appending("export.tar")
+                try f.doExport(name, to: exportPath)
+
+                let exportURL = URL(filePath: exportPath.string)
+                let attrs = try FileManager.default.attributesOfItem(atPath: exportPath.string)
+                let fileSize = attrs[.size] as! UInt64
+                #expect(fileSize > 0)
+
+                // TODO: verify foo bar baz are in tar file.
+                let reader = try ArchiveReader(file: exportURL)
+                let (foo, fooData) = try reader.extractFile(path: "/foo")
+                #expect(foo.fileType == .regular)
+                #expect(String(data: fooData, encoding: .utf8)?.starts(with: mustBeInImage) ?? false)
+            }
+        }
+    }
+}