Skip to content

Commit 51875a7

Browse files
committed
fix(docker): resolve rebase regressions
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent 85d4fa2 commit 51875a7

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

crates/openshell-driver-docker/src/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -998,12 +998,6 @@ impl DockerComputeDriver {
998998
image.ref = %template.image,
999999
))
10001000
.await?;
1001-
let token_file_created = write_sandbox_token_file(sandbox, &self.config)
1002-
.await
1003-
.map_err(|status| {
1004-
DockerProvisioningFailure::new("SandboxTokenWriteFailed", status.message())
1005-
})?;
1006-
10071001
let container_name = container_name_for_sandbox(sandbox);
10081002
let gpu_devices = self
10091003
.resolve_gpu_cdi_devices(

crates/openshell-driver-docker/src/tests.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ async fn tracing_in_process_service_preserves_the_driver_rpc_server_boundary() {
210210
Some(otel_tracing::IN_PROCESS_TARGET_PREFIX),
211211
))
212212
.with(otel_tracing::in_process_layer(&driver_provider));
213-
let service = ComputeDriverService::new_in_process(test_driver_with_config(runtime_config()));
213+
let service =
214+
ComputeDriverService::new_in_process(test_driver_with_config(runtime_config(false)));
214215

215216
async {
216217
let gateway_span = tracing::info_span!(
@@ -322,7 +323,7 @@ async fn tracing_lifecycle_rpc_failures_export_docker_operation_spans() {
322323
.with_simple_exporter(exporter.clone())
323324
.build();
324325
let subscriber = tracing_subscriber::registry().with(otel_tracing::layer(&provider));
325-
let driver = test_driver_with_config(runtime_config());
326+
let driver = test_driver_with_config(runtime_config(false));
326327

327328
async {
328329
ComputeDriver::create_sandbox(
@@ -376,7 +377,7 @@ async fn tracing_direct_start_exports_a_docker_start_span() {
376377
.with_simple_exporter(exporter.clone())
377378
.build();
378379
let subscriber = tracing_subscriber::registry().with(otel_tracing::layer(&provider));
379-
let driver = test_driver_with_config(runtime_config());
380+
let driver = test_driver_with_config(runtime_config(false));
380381

381382
DockerComputeDriver::start_sandbox(&driver, "", "")
382383
.with_subscriber(subscriber)
@@ -408,7 +409,7 @@ async fn tracing_image_preparation_failure_exports_nested_failed_spans() {
408409
.with_simple_exporter(exporter.clone())
409410
.build();
410411
let subscriber = tracing_subscriber::registry().with(otel_tracing::layer(&provider));
411-
let mut config = runtime_config();
412+
let mut config = runtime_config(false);
412413
config.image_pull_policy = "unsupported".to_string();
413414
let driver = test_driver_with_config(config);
414415

@@ -1123,7 +1124,7 @@ fn build_environment_keeps_network_capabilities_driver_controlled() {
11231124
openshell_core::sandbox_env::NETWORK_RUNTIME_CAPABILITIES.to_string(),
11241125
"spoofed".to_string(),
11251126
);
1126-
let env = build_environment(&sandbox, &runtime_config());
1127+
let env = build_environment(&sandbox, &runtime_config(false), false);
11271128
assert!(env.contains(&format!(
11281129
"{}={}",
11291130
openshell_core::sandbox_env::NETWORK_RUNTIME_CAPABILITIES,

0 commit comments

Comments
 (0)