Switch to newer ginkgo v2

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
kubernetes-sigs · Mar 27, 2023 · bd09216 · bd09216
1 parent ef89c29
commit bd09216
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/tests/e2e/apiserver_test.go b/tests/e2e/apiserver_test.go
@@ -24,7 +24,7 @@ import (
 	"io/ioutil"
 	yamlutil "k8s.io/apimachinery/pkg/util/yaml"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	batchv1 "k8s.io/api/batch/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/tests/e2e/suite_test.go b/tests/e2e/suite_test.go
@@ -24,10 +24,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/reporters"
+	"github.com/onsi/ginkgo/v2/reporters"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"k8s.io/apimachinery/pkg/util/uuid"
@@ -63,10 +62,10 @@ func TestE2E(t *testing.T) {
 		if err := os.MkdirAll(framework.TestContext.ReportDir, 0755); err != nil {
 			log.Fatalf("Failed creating report directory: %v", err)
 		} else {
-			r = append(r, reporters.NewJUnitReporter(path.Join(framework.TestContext.ReportDir, fmt.Sprintf("junit_%v%02d.xml", framework.TestContext.ReportPrefix, config.GinkgoConfig.ParallelNode))))
+			r = append(r, reporters.NewJUnitReporter(path.Join(framework.TestContext.ReportDir, fmt.Sprintf("junit_%v%02d.xml", framework.TestContext.ReportPrefix, GinkgoParallelProcess()))))
 		}
 	}
-	log.Printf("Starting e2e run %q on Ginkgo node %d", uuid.NewUUID(), config.GinkgoConfig.ParallelNode) // TODO use framework.RunID like upstream
+	log.Printf("Starting e2e run %q on Ginkgo node %d", uuid.NewUUID(), GinkgoParallelProcess()) // TODO use framework.RunID like upstream
 
 	RunSpecsWithDefaultAndCustomReporters(t, "AWS IAM Authenticator End-to-End Tests", r)
 }
diff --git a/tests/e2e/tests.go b/tests/e2e/tests.go
@@ -17,7 +17,7 @@ import (
 	"context"
 	"os"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	authv1 "k8s.io/api/authorization/v1"