Skip to content

Commit aabe6e0

Browse files
committed
e2e: adjusted tests to expect crun as the system default
Signed-off-by: Ronny Baturov <[email protected]>
1 parent 4d2e9ff commit aabe6e0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

test/e2e/performanceprofile/functests/2_performance_update/updating_profile.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,22 +1165,22 @@ var _ = Describe("[rfe_id:28761][performance] Updating parameters in performance
11651165
})
11661166

11671167
When("is not given", func() {
1168-
It("should run high-performance runtimes class with runc as container-runtime", func() {
1168+
It("should run high-performance runtimes class with crun as container-runtime", func() {
11691169
if ctrcfg != nil {
1170-
Skip("runc is not the default runtime configuration")
1170+
Skip("crun is not the default runtime configuration")
11711171
}
11721172
cmd := []string{"cat", "/rootfs/etc/crio/crio.conf.d/99-runtimes.conf"}
11731173
for i := 0; i < len(workerRTNodes); i++ {
11741174
output, err := nodes.ExecCommand(context.TODO(), &workerRTNodes[i], cmd)
11751175
Expect(err).ToNot(HaveOccurred(), "cannot get 99-runtimes.conf from %q", workerRTNodes[i].Name)
11761176
out := testutils.ToString(output)
11771177
By(fmt.Sprintf("checking node: %q", workerRTNodes[i].Name))
1178-
Expect(out).To(ContainSubstring("/bin/runc"))
1179-
Expect(out).To(ContainSubstring("/run/runc"))
1178+
Expect(out).To(ContainSubstring("/bin/crun"))
1179+
Expect(out).To(ContainSubstring("/run/crun"))
11801180
}
11811181
})
11821182
})
1183-
When("updates the default runtime to crun", func() {
1183+
When("updates the default runtime to runc", func() {
11841184
It("should run high-performance runtimes class with crun as container-runtime", func() {
11851185
if ctrcfg == nil {
11861186
testlog.Infof("ContainerRuntimeConfig not exist")
@@ -1201,14 +1201,14 @@ var _ = Describe("[rfe_id:28761][performance] Updating parameters in performance
12011201
By(fmt.Sprintf("waiting for mcp %q transition to UPDATED state", performanceMCP))
12021202
mcps.WaitForConditionFunc(performanceMCP, machineconfigv1.MachineConfigPoolUpdated, corev1.ConditionTrue, getMCPConditionStatus)
12031203
}
1204-
Expect(ctrcfg.Spec.ContainerRuntimeConfig.DefaultRuntime == machineconfigv1.ContainerRuntimeDefaultRuntimeCrun).To(BeTrue())
1204+
Expect(ctrcfg.Spec.ContainerRuntimeConfig.DefaultRuntime == machineconfigv1.ContainerRuntimeDefaultRuntimeRunc).To(BeTrue())
12051205
cmd := []string{"cat", "/rootfs/etc/crio/crio.conf.d/99-runtimes.conf"}
12061206
for i := 0; i < len(workerRTNodes); i++ {
12071207
out, err := nodes.ExecCommand(context.TODO(), &workerRTNodes[i], cmd)
12081208
Expect(err).ToNot(HaveOccurred(), "cannot get 99-runtimes.conf from %q", workerRTNodes[i].Name)
12091209
By(fmt.Sprintf("checking node: %q", workerRTNodes[i].Name))
1210-
Expect(out).To(ContainSubstring("/usr/bin/crun"))
1211-
Expect(out).To(ContainSubstring("/run/crun"))
1210+
Expect(out).To(ContainSubstring("/bin/runc"))
1211+
Expect(out).To(ContainSubstring("/run/runc"))
12121212
}
12131213
})
12141214
})
@@ -1317,7 +1317,7 @@ func newContainerRuntimeConfig(name string, profile *performancev2.PerformancePr
13171317
MatchLabels: profilecomponent.GetMachineConfigPoolSelector(profile, profileMCP),
13181318
},
13191319
ContainerRuntimeConfig: &machineconfigv1.ContainerRuntimeConfiguration{
1320-
DefaultRuntime: machineconfigv1.ContainerRuntimeDefaultRuntimeCrun,
1320+
DefaultRuntime: machineconfigv1.ContainerRuntimeDefaultRuntimeRunc,
13211321
},
13221322
},
13231323
}

0 commit comments

Comments
 (0)