fix: containerd crashing with sigsegv

See #10855

Also refactor conformance tests to increase parallelism and speed up
fast conformance tests.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
Andrey Smirnov 2025-05-02 21:20:06 +04:00
parent f7891c3018
commit b3b20eff3a
No known key found for this signature in database
GPG Key ID: FE042E3D4085A811
4 changed files with 8 additions and 14 deletions

View File

@ -25,9 +25,9 @@ DEBUG_TOOLS_SOURCE := scratch
EMBED_TARGET ?= embed
TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
TOOLS ?= v1.10.0
TOOLS ?= v1.11.0-alpha.0
PKGS_PREFIX ?= ghcr.io/siderolabs
PKGS ?= v1.11.0-alpha.0-3-g9cea00b
PKGS ?= v1.11.0-alpha.0-6-ga347857
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest

View File

@ -28,7 +28,7 @@ import (
type Options struct {
RunTests []string
Skip string
Parallel bool
Parallel int
RunTimeout time.Duration
DeleteTimeout time.Duration
@ -49,6 +49,7 @@ func DefaultOptions() *Options {
"Services should serve a basic endpoint from pods",
"Services should be able to change the type from ExternalName to ClusterIP",
},
Parallel: 2,
RunTimeout: 10 * time.Minute,
DeleteTimeout: 3 * time.Minute,
@ -63,7 +64,7 @@ func FastConformance(ctx context.Context, cluster cluster.K8sProvider) error {
{
RunTests: []string{`\[Conformance\]`},
Skip: `\[Serial\]`,
Parallel: true,
Parallel: 16,
RunTimeout: time.Hour,
DeleteTimeout: 5 * time.Minute,
@ -74,7 +75,6 @@ func FastConformance(ctx context.Context, cluster cluster.K8sProvider) error {
},
{
RunTests: []string{`\[Serial\].*\[Conformance\]`},
Parallel: false,
RunTimeout: time.Hour,
DeleteTimeout: 5 * time.Minute,
@ -99,8 +99,6 @@ func CertifiedConformance(ctx context.Context, cluster cluster.K8sProvider) erro
options := Options{
RunTests: []string{`\[Conformance\]`},
Parallel: false,
RunTimeout: 2 * time.Hour,
DeleteTimeout: 5 * time.Minute,
@ -139,11 +137,7 @@ func Run(ctx context.Context, cluster cluster.K8sProvider, options *Options) err
config := types.NewDefaultConfiguration()
config.ConformanceImage = fmt.Sprintf("registry.k8s.io/conformance:v%s", options.KubernetesVersion)
config.OutputDir = options.ResultsPath
if options.Parallel {
config.Parallel = 4
}
config.Parallel = options.Parallel
config.Skip = options.Skip
clientset, err := cluster.K8sClient(ctx)

View File

@ -1 +1 @@
v1.11.0-alpha.0-3-g9cea00b
v1.11.0-alpha.0-6-ga347857

View File

@ -1 +1 @@
v1.10.0
v1.11.0-alpha.0