This is an automated email from the ASF dual-hosted git repository.
wilfreds 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 b07953ad [YUNIKORN-3062] Refactor restart_changed_config E2E test
(#977)
b07953ad is described below
commit b07953ad9bf525f6c5b0cd77ccb9c9035ab2f264
Author: Barry Wu <[email protected]>
AuthorDate: Tue Jul 22 13:11:19 2025 +1000
[YUNIKORN-3062] Refactor restart_changed_config E2E test (#977)
Refactor restart_changed_config E2E test suite structure moving before
and after suite to the suite file.
Closes: #977
Signed-off-by: Wilfred Spiegelenburg <[email protected]>
---
.../restart_changed_config_suite_test.go | 39 +++++++++++++++
.../restart_changed_config_test.go | 57 ++++------------------
2 files changed, 49 insertions(+), 47 deletions(-)
diff --git
a/test/e2e/restart_changed_config/restart_changed_config_suite_test.go
b/test/e2e/restart_changed_config/restart_changed_config_suite_test.go
index bad8763f..747ed4c9 100644
--- a/test/e2e/restart_changed_config/restart_changed_config_suite_test.go
+++ b/test/e2e/restart_changed_config/restart_changed_config_suite_test.go
@@ -20,6 +20,7 @@ package restartchangedconfig_test
import (
"path/filepath"
+ "runtime"
"testing"
"github.com/onsi/ginkgo/v2"
@@ -27,6 +28,9 @@ import (
"github.com/onsi/gomega"
"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() {
@@ -46,5 +50,40 @@ func TestRestartChangedConfig(t *testing.T) {
ginkgo.RunSpecs(t, "TestRestartChangedConfig",
ginkgo.Label("TestRestartChangedConfig"))
}
+var _ = ginkgo.BeforeSuite(func() {
+ _, filename, _, _ := runtime.Caller(0)
+ suiteName = common.GetSuiteName(filename)
+ // Initializing kubectl client
+ kClient = k8s.KubeCtl{}
+ Ω(kClient.SetClient()).To(gomega.BeNil())
+ // Initializing rest client
+ restClient = yunikorn.RClient{}
+
+ yunikorn.EnsureYuniKornConfigsPresent()
+ yunikorn.UpdateConfigMapWrapper(oldConfigMap, "")
+
+ ginkgo.By("Port-forward the scheduler pod")
+ var err = kClient.PortForwardYkSchedulerPod()
+ Ω(err).NotTo(gomega.HaveOccurred())
+})
+
+var _ = ginkgo.AfterSuite(func() {
+ // call the healthCheck api to check scheduler health
+ ginkgo.By("Check YuniKorn's health")
+ checks, err2 := yunikorn.GetFailedHealthChecks()
+ Ω(err2).NotTo(gomega.HaveOccurred())
+ Ω(checks).To(gomega.Equal(""), checks)
+
+ ginkgo.By("Restoring the old config maps")
+ var c, err1 =
kClient.GetConfigMaps(configmanager.YuniKornTestConfig.YkNamespace,
+ configmanager.DefaultYuniKornConfigMap)
+ Ω(err1).NotTo(gomega.HaveOccurred())
+ Ω(c).NotTo(gomega.BeNil())
+ c.Data = oldConfigMap.Data
+ var e, err3 = kClient.UpdateConfigMap(c,
configmanager.YuniKornTestConfig.YkNamespace)
+ Ω(err3).NotTo(gomega.HaveOccurred())
+ Ω(e).NotTo(gomega.BeNil())
+})
+
var Ω = gomega.Ω
var HaveOccurred = gomega.HaveOccurred
diff --git a/test/e2e/restart_changed_config/restart_changed_config_test.go
b/test/e2e/restart_changed_config/restart_changed_config_test.go
index a54fe8af..a61d452f 100644
--- a/test/e2e/restart_changed_config/restart_changed_config_test.go
+++ b/test/e2e/restart_changed_config/restart_changed_config_test.go
@@ -19,7 +19,6 @@
package restartchangedconfig_test
import (
- "runtime"
"time"
"github.com/onsi/ginkgo/v2"
@@ -30,7 +29,6 @@ import (
"github.com/apache/yunikorn-core/pkg/scheduler/placement/types"
"github.com/apache/yunikorn-core/pkg/webservice/dao"
tests "github.com/apache/yunikorn-k8shim/test/e2e"
- "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"
@@ -47,52 +45,17 @@ var (
sleepPod2Configs = k8s.SleepPodConfig{Name: "sleepjob2", NS: test}
)
-var _ = ginkgo.BeforeSuite(func() {
- _, filename, _, _ := runtime.Caller(0)
- suiteName = common.GetSuiteName(filename)
- // Initializing kubectl client
- kClient = k8s.KubeCtl{}
- Ω(kClient.SetClient()).To(gomega.BeNil())
- // Initializing rest client
- restClient = yunikorn.RClient{}
-
- yunikorn.EnsureYuniKornConfigsPresent()
- yunikorn.UpdateConfigMapWrapper(oldConfigMap, "")
-
- ginkgo.By("Port-forward the scheduler pod")
- var err = kClient.PortForwardYkSchedulerPod()
- Ω(err).NotTo(gomega.HaveOccurred())
-})
-
-var _ = ginkgo.BeforeEach(func() {
- ginkgo.By("create development namespace")
- ns, err := kClient.CreateNamespace(dev, nil)
- gomega.Ω(err).NotTo(gomega.HaveOccurred())
- gomega.Ω(ns.Status.Phase).To(gomega.Equal(v1.NamespaceActive))
- ns, err = kClient.CreateNamespace(test, nil)
- gomega.Ω(err).NotTo(gomega.HaveOccurred())
- gomega.Ω(ns.Status.Phase).To(gomega.Equal(v1.NamespaceActive))
-})
-
-var _ = ginkgo.AfterSuite(func() {
- // call the healthCheck api to check scheduler health
- ginkgo.By("Check YuniKorn's health")
- checks, err2 := yunikorn.GetFailedHealthChecks()
- Ω(err2).NotTo(gomega.HaveOccurred())
- Ω(checks).To(gomega.Equal(""), checks)
-
- ginkgo.By("Restoring the old config maps")
- var c, err1 =
kClient.GetConfigMaps(configmanager.YuniKornTestConfig.YkNamespace,
- configmanager.DefaultYuniKornConfigMap)
- Ω(err1).NotTo(gomega.HaveOccurred())
- Ω(c).NotTo(gomega.BeNil())
- c.Data = oldConfigMap.Data
- var e, err3 = kClient.UpdateConfigMap(c,
configmanager.YuniKornTestConfig.YkNamespace)
- Ω(err3).NotTo(gomega.HaveOccurred())
- Ω(e).NotTo(gomega.BeNil())
-})
-
var _ = ginkgo.Describe("PodInRecoveryQueue", func() {
+ ginkgo.BeforeEach(func() {
+ ginkgo.By("create development namespace")
+ ns, err := kClient.CreateNamespace(dev, nil)
+ gomega.Ω(err).NotTo(gomega.HaveOccurred())
+ gomega.Ω(ns.Status.Phase).To(gomega.Equal(v1.NamespaceActive))
+ ns, err = kClient.CreateNamespace(test, nil)
+ gomega.Ω(err).NotTo(gomega.HaveOccurred())
+ gomega.Ω(ns.Status.Phase).To(gomega.Equal(v1.NamespaceActive))
+ })
+
ginkgo.It("Pod_Restored_In_Recovery_Queue", func() {
ginkgo.By("Deploy 1st sleep pod to the dev namespace")
podConf, podErr := k8s.InitSleepPod(sleepPodConfigs)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
