diff --git a/Makefile b/Makefile index cb9716151..c97c267fe 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/pkg/cluster/hydrophone/hydrophone.go b/pkg/cluster/hydrophone/hydrophone.go index e1c2c516b..576022cf6 100644 --- a/pkg/cluster/hydrophone/hydrophone.go +++ b/pkg/cluster/hydrophone/hydrophone.go @@ -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) diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index 863a30dfe..f2d010af7 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.11.0-alpha.0-3-g9cea00b \ No newline at end of file +v1.11.0-alpha.0-6-ga347857 \ No newline at end of file diff --git a/pkg/machinery/gendata/data/tools b/pkg/machinery/gendata/data/tools index e1e35526c..328b533ea 100644 --- a/pkg/machinery/gendata/data/tools +++ b/pkg/machinery/gendata/data/tools @@ -1 +1 @@ -v1.10.0 \ No newline at end of file +v1.11.0-alpha.0 \ No newline at end of file