|
1 |
| -// Copyright (c) 2020, 2023, Oracle and/or its affiliates. |
| 1 | +// Copyright (c) 2020, 2024, Oracle and/or its affiliates. |
2 | 2 | //
|
3 | 3 | // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
|
4 | 4 |
|
@@ -67,7 +67,7 @@ var kindK8sNodeImages = map[string]string{
|
67 | 67 | }
|
68 | 68 |
|
69 | 69 | var (
|
70 |
| - kindCmd = []string{"go", "run", "sigs.k8s.io/kind"} |
| 70 | + kindCmd = []string{"systemd-run", "--scope", "--user", "-p", "Delegate=yes", "go", "run", "sigs.k8s.io/kind"} |
71 | 71 | )
|
72 | 72 |
|
73 | 73 | // shortUUID returns a short UUID to be used by the methods
|
@@ -344,7 +344,7 @@ func (t *testRunner) init(ctx context.Context) {
|
344 | 344 | t.testDir = filepath.Dir(currentFilePath)
|
345 | 345 |
|
346 | 346 | // By default, use the latest e2e-tests image
|
347 |
| - t.e2eTestImageName = "e2e-tests" |
| 347 | + t.e2eTestImageName = "localhost/e2e-tests" |
348 | 348 |
|
349 | 349 | // Run the pod in the default namespace
|
350 | 350 | t.e2eTestPodNamespace = "default"
|
@@ -766,7 +766,7 @@ func (t *testRunner) loadImagesIntoK8sCluster() bool {
|
766 | 766 | versionNumber := string(versionBytes)
|
767 | 767 | // trim the newline from version
|
768 | 768 | versionNumber = versionNumber[:len(versionNumber)-1]
|
769 |
| - options.ndbOperatorImage = "mysql/ndb-operator:" + versionNumber |
| 769 | + options.ndbOperatorImage = "localhost/mysql/ndb-operator:" + versionNumber |
770 | 770 | }
|
771 | 771 | if !t.p.loadImageIntoK8sCluster(t, options.ndbOperatorImage) {
|
772 | 772 | return false
|
@@ -884,10 +884,10 @@ func init() {
|
884 | 884 | "Enable this to run tests from outside the K8s cluster.\n"+
|
885 | 885 | "By default, this is not enabled and the tests will be run as a pod from inside K8s Cluster.")
|
886 | 886 |
|
887 |
| - // use v1.21 as default kind k8s version |
888 |
| - flag.StringVar(&options.kindK8sVersion, "kind-k8s-version", "1.21", |
| 887 | + // use v1.23 as default kind k8s version |
| 888 | + flag.StringVar(&options.kindK8sVersion, "kind-k8s-version", "1.23", |
889 | 889 | "Kind k8s version used to run tests.\n"+
|
890 |
| - "Example usage: -kind-k8s-version=1.20") |
| 890 | + "Example usage: -kind-k8s-version=1.23") |
891 | 891 |
|
892 | 892 | // test suites to be run.
|
893 | 893 | flag.StringVar(&options.suites, "suites", "",
|
|
0 commit comments