Skip to content

Commit 3ff649d

Browse files
committed
fix: isolate remote snapshotter integration tests to increase stability
Signed-off-by: Austin Vazquez <[email protected]>
1 parent 992cdc2 commit 3ff649d

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

.buildkite/pipeline.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ steps:
7373
- make test-in-docker
7474
timeout_in_minutes: 10
7575

76-
- label: ":running: snapshotter isolated tests"
76+
- label: ":running: runtime isolated tests"
7777
agents:
7878
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
7979
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
@@ -82,12 +82,17 @@ steps:
8282
DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
8383
NUMBER_OF_VMS: 10
8484
EXTRAGOARGS: "-v -count=1 -race"
85+
FICD_DM_VOLUME_GROUP: fcci-vg
8586
artifact_paths:
86-
- "snapshotter/logs/*"
87+
- "runtime/logs/*"
8788
command:
88-
- make -C snapshotter integ-test
89+
- make -C runtime integ-test FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_runtime
8990

90-
- label: ":running: runtime isolated tests"
91+
- wait
92+
93+
# Let's isolate the remote snapshotter integration tests.
94+
# See https://github.com/firecracker-microvm/firecracker-containerd/issues/673
95+
- label: ":running: snapshotter isolated tests"
9196
agents:
9297
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
9398
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
@@ -96,11 +101,12 @@ steps:
96101
DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
97102
NUMBER_OF_VMS: 10
98103
EXTRAGOARGS: "-v -count=1 -race"
99-
FICD_DM_VOLUME_GROUP: fcci-vg
100104
artifact_paths:
101-
- "runtime/logs/*"
105+
- "snapshotter/logs/*"
102106
command:
103-
- make -C runtime integ-test FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_runtime
107+
- make -C snapshotter integ-test
108+
109+
- wait
104110

105111
- label: ":weight_lifter: stress tests"
106112
concurrency_group: stress

snapshotter/service_integ_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,13 @@ func launchContainerWithRemoteSnapshotterInVM(ctx context.Context, vmID string)
9999
return fmt.Errorf("Failed to create fccontrol client. [%v]", err)
100100
}
101101

102+
// Disable 8250 serial device and lessen the number of log messages written to the serial console.
103+
// https://github.com/firecracker-microvm/firecracker/blob/v1.1.0/docs/prod-host-setup.md
104+
kernelArgs := integtest.DefaultRuntimeConfig.KernelArgs + " 8250.nr_uarts=0 quiet loglevel=1"
105+
102106
_, err = fcClient.CreateVM(ctx, &proto.CreateVMRequest{
103-
VMID: vmID,
107+
VMID: vmID,
108+
KernelArgs: kernelArgs,
104109
RootDrive: &proto.FirecrackerRootDrive{
105110
HostPath: "/var/lib/firecracker-containerd/runtime/rootfs-stargz.img",
106111
},
@@ -117,6 +122,7 @@ func launchContainerWithRemoteSnapshotterInVM(ctx context.Context, vmID string)
117122
VcpuCount: 1,
118123
MemSizeMib: 1024,
119124
},
125+
TimeoutSeconds: 60,
120126
ContainerCount: 1,
121127
})
122128
if err != nil {

0 commit comments

Comments
 (0)