Merge pull request #588 from hzxuzhonghu/e2e-framework

Cleanup e2e framework to speed up e2e

docs/development/development.md

@@ -118,7 +118,7 @@ make e2e-test-kind
 If you want to run e2e test in a existing cluster with volcano deployed, run the following:
 
 ```bash
-export VK_BIN= need to set vcctl binary path (eg:.../src/volcano.sh/volcano/_output/bin/)
+export VC_BIN= need to set vcctl binary path (eg:.../src/volcano.sh/volcano/_output/bin/)
 KUBECONFIG=${KUBECONFIG} go test ./test/e2e
 ```
 

hack/run-e2e-kind.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export VK_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/..
-export VK_BIN=${VK_ROOT}/${BIN_DIR}/${BIN_OSARCH}
+export VC_BIN=${VK_ROOT}/${BIN_DIR}/${BIN_OSARCH}
 export LOG_LEVEL=3
 export SHOW_VOLCANO_LOGS=${SHOW_VOLCANO_LOGS:-1}
 export CLEANUP_CLUSTER=${CLEANUP_CLUSTER:-1}

test/e2e/admission.go

@@ -34,7 +34,7 @@ var _ = Describe("Job E2E Test: Test Admission service", func() {
 	It("Default queue would be added", func() {
 		jobName := "job-default-queue"
 		namespace := "test"
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		_, err := createJobInner(context, &jobSpec{
@@ -60,7 +60,7 @@ var _ = Describe("Job E2E Test: Test Admission service", func() {
 
 	It("Invalid CPU unit", func() {
 
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 		namespace := "test"
 
@@ -109,7 +109,7 @@ var _ = Describe("Job E2E Test: Test Admission service", func() {
 
 	It("Invalid memory unit", func() {
 
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 		namespace := "test"
 
@@ -160,7 +160,7 @@ var _ = Describe("Job E2E Test: Test Admission service", func() {
 	It("Create default-scheduler pod", func() {
 		podName := "pod-default-scheduler"
 		namespace := "test"
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		pod := &corev1.Pod{
@@ -188,7 +188,7 @@ var _ = Describe("Job E2E Test: Test Admission service", func() {
 		podName := "pod-volcano"
 		pgName := "pending-pg"
 		namespace := "test"
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		pg := &schedulingv1alpha2.PodGroup{

test/e2e/cli_util.go

@@ -72,7 +72,10 @@ func RunCliCommand(command []string) string {
 		command = append(command, "--master", masterURL())
 	}
 	command = append(command, "--kubeconfig", kubeconfigPath(homeDir()))
-	output, err := exec.Command(VolcanoCliBinary(), command...).Output()
+	vcctl := VolcanoCliBinary()
+	Expect(fileExist(vcctl)).To(BeTrue(), fmt.Sprintf(
+		"vcctl binary: %s is required for E2E tests, please update VC_BIN environment", vcctl))
+	output, err := exec.Command(vcctl, command...).Output()
 	Expect(err).NotTo(HaveOccurred(),
 		fmt.Sprintf("Command %s failed to execute: %s", strings.Join(command, ""), err))
 	return string(output)
@@ -83,8 +86,10 @@ func RunCliCommandWithoutKubeConfig(command []string) string {
 	if masterURL() != "" {
 		command = append(command, "--master", masterURL())
 	}
-
-	output, err := exec.Command(VolcanoCliBinary(), command...).Output()
+	vcctl := VolcanoCliBinary()
+	Expect(fileExist(vcctl)).To(BeTrue(), fmt.Sprintf(
+		"vcctl binary: %s is required for E2E tests, please update VC_BIN environment", vcctl))
+	output, err := exec.Command(vcctl, command...).Output()
 	Expect(err).NotTo(HaveOccurred(),
 		fmt.Sprintf("Command %s failed to execute: %s", strings.Join(command, ""), err))
 	return string(output)

test/e2e/command.go

@@ -36,7 +36,7 @@ var _ = Describe("Job E2E Test: Test Job Command", func() {
 		var outBuffer bytes.Buffer
 		jobName := "test-job"
 		namespace := "test"
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 		rep := clusterSize(context, oneCPU)
 
@@ -70,7 +70,7 @@ var _ = Describe("Job E2E Test: Test Job Command", func() {
 		jobName := "test-suspend-running-job"
 		taskName := "long-live-task"
 		namespace := "test"
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		job := createJob(context, &jobSpec{
@@ -113,7 +113,7 @@ var _ = Describe("Job E2E Test: Test Job Command", func() {
 	})
 
 	It("Suspend pending job", func() {
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 		rep := clusterSize(context, oneCPU)
 
@@ -157,7 +157,7 @@ var _ = Describe("Job E2E Test: Test Job Command", func() {
 
 		jobName := "test-del-job"
 		namespace := "test"
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 		rep := clusterSize(context, oneCPU)
 

test/e2e/job_controlled_resource.go

@@ -32,7 +32,7 @@ var _ = Describe("Job E2E Test: Test Job PVCs", func() {
 		taskName := "pvctask"
 		pvName := "job-pv-name"
 		pvcName := "job-pvc-name-exist"
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		var tt v12.HostPathType
@@ -136,7 +136,7 @@ var _ = Describe("Job E2E Test: Test Job PVCs", func() {
 	It("Generate PodGroup and valid minResource when creating job", func() {
 		jobName := "job-name-podgroup"
 		namespace := "test"
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		resource := v12.ResourceList{

test/e2e/job_error_handling.go

@@ -17,9 +17,10 @@ limitations under the License.
 package e2e
 
 import (
+	"strconv"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"strconv"
 
 	"k8s.io/api/core/v1"
 
@@ -31,7 +32,7 @@ import (
 var _ = Describe("Job Error Handling", func() {
 	It("job level LifecyclePolicy, Event: PodFailed; Action: RestartJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -68,7 +69,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event: PodFailed; Action: TerminateJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -105,7 +106,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event: PodFailed; Action: AbortJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -142,7 +143,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event: PodEvicted; Action: RestartJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -186,7 +187,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event: PodEvicted; Action: TerminateJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -230,7 +231,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event: PodEvicted; Action: AbortJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -274,7 +275,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event: Any; Action: RestartJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -318,7 +319,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("Job error handling: Restart job when job is unschedulable", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 		rep := clusterSize(context, oneCPU)
 
@@ -377,7 +378,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("Job error handling: Abort job when job is unschedulable", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 		rep := clusterSize(context, oneCPU)
 
@@ -432,7 +433,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event: TaskCompleted; Action: CompletedJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -472,7 +473,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, error code: 3; Action: RestartJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -510,7 +511,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event[]: PodEvicted, PodFailed; Action: TerminateJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -556,7 +557,7 @@ var _ = Describe("Job Error Handling", func() {
 	})
 	It("Task level LifecyclePolicy, Event: PodFailed; Action: RestartJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -592,7 +593,7 @@ var _ = Describe("Job Error Handling", func() {
 	})
 	It("Task level LifecyclePolicy, Event: PodEvicted; Action: RestartJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -636,7 +637,7 @@ var _ = Describe("Job Error Handling", func() {
 	})
 	It("Task level LifecyclePolicy, Event: PodEvicted; Action: TerminateJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -679,7 +680,7 @@ var _ = Describe("Job Error Handling", func() {
 	})
 	It("Task level LifecyclePolicy, Event: TaskCompleted; Action: CompletedJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -719,7 +720,7 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("job level LifecyclePolicy, Event: PodFailed; Action: AbortJob and Task level lifecyclePolicy, Event : PodFailed; Action: RestartJob", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -762,7 +763,9 @@ var _ = Describe("Job Error Handling", func() {
 
 	It("Task Priority", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{
+			priorityClasses: []string{masterPriority, workerPriority},
+		})
 		defer cleanupTestContext(context)
 
 		rep := clusterSize(context, oneCPU)

test/e2e/job_lifecycle.go

@@ -30,7 +30,7 @@ import (
 var _ = Describe("Job Life Cycle", func() {
 	It("Delete job that is pending state", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -62,7 +62,7 @@ var _ = Describe("Job Life Cycle", func() {
 
 	It("Delete job that is Running state", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -93,7 +93,7 @@ var _ = Describe("Job Life Cycle", func() {
 
 	It("Delete job that is Completed state", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -126,7 +126,7 @@ var _ = Describe("Job Life Cycle", func() {
 
 	It("Delete job that is Failed job", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -165,7 +165,7 @@ var _ = Describe("Job Life Cycle", func() {
 
 	It("Delete job that is terminated job", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -204,7 +204,7 @@ var _ = Describe("Job Life Cycle", func() {
 
 	It("Create and Delete job with CPU requirement", func() {
 		By("init test context")
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		By("create job")
@@ -243,7 +243,7 @@ var _ = Describe("Job Life Cycle", func() {
 	})
 
 	It("Checking Event Generation for job", func() {
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		job := createJob(context, &jobSpec{
@@ -271,7 +271,7 @@ var _ = Describe("Job Life Cycle", func() {
 	})
 
 	It("Checking Unschedulable Event Generation for job", func() {
-		context := initTestContext()
+		context := initTestContext(options{})
 		defer cleanupTestContext(context)
 
 		nodeName, rep := computeNode(context, oneCPU)