This is an automated email from the ASF dual-hosted git repository.
chenyulin0719 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-k8shim.git
The following commit(s) were added to refs/heads/master by this push:
new 68feb239 [YUNIKORN-3057] Refactor basic_scheduling E2E test suite
structure (#968)
68feb239 is described below
commit 68feb239a8219e4e746c22065fd3104fe787ac7b
Author: Michael Chu <[email protected]>
AuthorDate: Mon Apr 28 15:10:59 2025 +0000
[YUNIKORN-3057] Refactor basic_scheduling E2E test suite structure (#968)
Closes: #968
Signed-off-by: Yu-Lin Chen <[email protected]>
---
.../basic_scheduling_suite_test.go | 22 ++++++++
test/e2e/basic_scheduling/basic_scheduling_test.go | 64 +++++++---------------
2 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/test/e2e/basic_scheduling/basic_scheduling_suite_test.go
b/test/e2e/basic_scheduling/basic_scheduling_suite_test.go
index 7ba3c711..a0245c40 100644
--- a/test/e2e/basic_scheduling/basic_scheduling_suite_test.go
+++ b/test/e2e/basic_scheduling/basic_scheduling_suite_test.go
@@ -20,6 +20,7 @@ package basicscheduling_test
import (
"path/filepath"
+ "runtime"
"testing"
"github.com/onsi/ginkgo/v2/reporters"
@@ -29,6 +30,8 @@ import (
"github.com/apache/yunikorn-k8shim/test/e2e/framework/configmanager"
"github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/common"
+ "github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/k8s"
+ "github.com/apache/yunikorn-k8shim/test/e2e/framework/helpers/yunikorn"
)
func init() {
@@ -57,3 +60,22 @@ var BeNil = gomega.BeNil
var dev string
var HaveOccurred = gomega.HaveOccurred
var BeEquivalentTo = gomega.BeEquivalentTo
+
+var _ = ginkgo.BeforeSuite(func() {
+ _, filename, _, _ := runtime.Caller(0)
+ suiteName = common.GetSuiteName(filename)
+ // Initializing kubectl client
+ kClient = k8s.KubeCtl{}
+ gomega.Ω(kClient.SetClient()).To(gomega.Succeed())
+ // Initializing rest client
+ restClient = yunikorn.RClient{}
+ yunikorn.EnsureYuniKornConfigsPresent()
+ By("Port-forward the scheduler pod")
+ err := kClient.PortForwardYkSchedulerPod()
+ Ω(err).NotTo(HaveOccurred())
+ yunikorn.UpdateConfigMapWrapper(oldConfigMap, "fifo")
+})
+
+var _ = ginkgo.AfterSuite(func() {
+ yunikorn.RestoreConfigMapWrapper(oldConfigMap)
+})
diff --git a/test/e2e/basic_scheduling/basic_scheduling_test.go
b/test/e2e/basic_scheduling/basic_scheduling_test.go
index 55439385..e4a7d990 100644
--- a/test/e2e/basic_scheduling/basic_scheduling_test.go
+++ b/test/e2e/basic_scheduling/basic_scheduling_test.go
@@ -19,7 +19,6 @@
package basicscheduling_test
import (
- "runtime"
"time"
"github.com/onsi/ginkgo/v2"
@@ -43,49 +42,25 @@ var oldConfigMap = new(v1.ConfigMap)
// Define sleepPod
var sleepPodConfigs = k8s.SleepPodConfig{Name: "sleepjob", NS: dev}
-var _ = ginkgo.BeforeSuite(func() {
- _, filename, _, _ := runtime.Caller(0)
- suiteName = common.GetSuiteName(filename)
- // Initializing kubectl client
- kClient = k8s.KubeCtl{}
- gomega.Ω(kClient.SetClient()).To(gomega.Succeed())
- // Initializing rest client
- restClient = yunikorn.RClient{}
- yunikorn.EnsureYuniKornConfigsPresent()
- By("Port-forward the scheduler pod")
- err := kClient.PortForwardYkSchedulerPod()
- Ω(err).NotTo(HaveOccurred())
- yunikorn.UpdateConfigMapWrapper(oldConfigMap, "fifo")
-})
-var _ = ginkgo.BeforeEach(func() {
- dev = "dev" + common.RandSeq(5)
- ginkgo.By("create development namespace")
- ns1, err := kClient.CreateNamespace(dev, nil)
- gomega.Ω(err).NotTo(gomega.HaveOccurred())
- gomega.Ω(ns1.Status.Phase).To(gomega.Equal(v1.NamespaceActive))
- ginkgo.By("Deploy the sleep pod to the development namespace")
- initPod, podErr := k8s.InitSleepPod(sleepPodConfigs)
- gomega.Ω(podErr).NotTo(gomega.HaveOccurred())
- sleepRespPod, err = kClient.CreatePod(initPod, dev)
- gomega.Ω(err).NotTo(gomega.HaveOccurred())
- // Wait for pod to move to running state
- err = kClient.WaitForPodRunning(dev, sleepPodConfigs.Name,
30*time.Second)
- gomega.Ω(err).NotTo(gomega.HaveOccurred())
- appsInfo, err = restClient.GetAppInfo("default", "root."+dev,
sleepRespPod.ObjectMeta.Labels["applicationId"])
- gomega.Ω(err).NotTo(gomega.HaveOccurred())
- gomega.Ω(appsInfo).NotTo(gomega.BeNil())
-})
-var _ = ginkgo.AfterEach(func() {
- ginkgo.By("Tear down namespace: " + dev)
- err := kClient.TearDownNamespace(dev)
- Ω(err).NotTo(HaveOccurred())
-})
-
-var _ = ginkgo.AfterSuite(func() {
- yunikorn.RestoreConfigMapWrapper(oldConfigMap)
-})
-
var _ = ginkgo.Describe("", func() {
+ ginkgo.BeforeEach(func() {
+ dev = "dev" + common.RandSeq(5)
+ ginkgo.By("create development namespace")
+ ns1, err := kClient.CreateNamespace(dev, nil)
+ gomega.Ω(err).NotTo(gomega.HaveOccurred())
+ gomega.Ω(ns1.Status.Phase).To(gomega.Equal(v1.NamespaceActive))
+ ginkgo.By("Deploy the sleep pod to the development namespace")
+ initPod, podErr := k8s.InitSleepPod(sleepPodConfigs)
+ gomega.Ω(podErr).NotTo(gomega.HaveOccurred())
+ sleepRespPod, err = kClient.CreatePod(initPod, dev)
+ gomega.Ω(err).NotTo(gomega.HaveOccurred())
+ // Wait for pod to move to running state
+ err = kClient.WaitForPodRunning(dev, sleepPodConfigs.Name,
30*time.Second)
+ gomega.Ω(err).NotTo(gomega.HaveOccurred())
+ appsInfo, err = restClient.GetAppInfo("default", "root."+dev,
sleepRespPod.ObjectMeta.Labels["applicationId"])
+ gomega.Ω(err).NotTo(gomega.HaveOccurred())
+ gomega.Ω(appsInfo).NotTo(gomega.BeNil())
+ })
ginkgo.It("Verify_App_Queue_Info", func() {
ginkgo.By("Verify that the sleep pod is mapped to development
queue")
@@ -194,5 +169,8 @@ var _ = ginkgo.Describe("", func() {
checks, err := yunikorn.GetFailedHealthChecks()
Ω(err).NotTo(HaveOccurred())
Ω(checks).To(gomega.Equal(""), checks)
+ ginkgo.By("Tear down namespace: " + dev)
+ err = kClient.TearDownNamespace(dev)
+ Ω(err).NotTo(HaveOccurred())
})
})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
