Make it easier to E2E test on various K8s versions (#1599)

This commit is contained in:
Yusuke Kuoka
2022-07-06 08:57:21 +09:00
committed by GitHub
parent edbdef8d20
commit b8e4eee904
2 changed files with 20 additions and 9 deletions

View File

@@ -122,11 +122,12 @@ func TestE2E(t *testing.T) {
t.Skip("Skipped as -short is set")
}
k8sMinorVer := os.Getenv("ARC_E2E_KUBE_VERSION")
skipRunnerCleanUp := os.Getenv("ARC_E2E_SKIP_RUNNER_CLEANUP") != ""
retainCluster := os.Getenv("ARC_E2E_RETAIN_CLUSTER") != ""
skipTestIDCleanUp := os.Getenv("ARC_E2E_SKIP_TEST_ID_CLEANUP") != ""
env := initTestEnv(t)
env := initTestEnv(t, k8sMinorVer)
t.Run("build and load images", func(t *testing.T) {
env.buildAndLoadImages(t)
@@ -264,10 +265,10 @@ type env struct {
dockerdWithinRunnerContainer bool
}
func initTestEnv(t *testing.T) *env {
func initTestEnv(t *testing.T, k8sMinorVer string) *env {
t.Helper()
testingEnv := testing.Start(t, testing.Preload(images...))
testingEnv := testing.Start(t, k8sMinorVer, testing.Preload(images...))
e := &env{Env: testingEnv}