enha: e2e add group (#325)

vesoft-inc · Oct 11, 2023 · 1a0d75b · 1a0d75b
1 parent e520102
commit 1a0d75b
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 6 deletions.
diff --git a/tests/e2e/README.md b/tests/e2e/README.md
@@ -15,3 +15,18 @@ export E2E_DOCKER_CONFIG_JSON_SECRET=`cat ~/.docker/config.json| base64 -w 0`
 export E2E_OPERATOR_INSTALL=false # if you already install nebula-operator
 make e2e E2EARGS="--kubeconfig ~/.kube/config"
 ```
+
+# run certain specified cases
+
+The test cases can be filtered using `-labels key1=value1,key2=value2` and `-feature regular-expression` flag.
+
+```shell
+# use -labels
+make e2e E2EARGS="--kubeconfig ~/.kube/config -labels category=basic,group=scale"
+
+# use -feature
+make e2e E2EARGS="--kubeconfig ~/.kube/config -feature 'scale.*default'"
+
+# use -labels and -feature
+make e2e E2EARGS="--kubeconfig ~/.kube/config -labels category=basic,group=scale -feature 'scale.*default'"
+```
diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go
@@ -39,7 +39,7 @@ const (
 	ImagePullSecretName = "image-pull-secret.e2e"
 
 	LabelKeyCategory = "category"
-	LabelKeyCase     = "case"
+	LabelKeyGroup    = "group"
 )
 
 var (

diff --git a/tests/e2e/nebulacluster_basic_test.go b/tests/e2e/nebulacluster_basic_test.go
@@ -5,11 +5,28 @@ import (
 	"sigs.k8s.io/e2e-framework/third_party/helm"
 )
 
-var testCasesBasic = []ncTestCase{
+const (
+	LabelCategoryBasic = "basic"
+	LabelGroupScale    = "scale"
+)
+
+var testCasesBasic []ncTestCase
+
+func init() {
+	testCasesBasic = append(testCasesBasic, testCasesBasicScale...)
+	testCasesBasic = append(testCasesBasic, testCasesBasicVersion...)
+	testCasesBasic = append(testCasesBasic, testCasesBasicResources...)
+	testCasesBasic = append(testCasesBasic, testCasesBasicImage...)
+	testCasesBasic = append(testCasesBasic, testCasesBasicVolume...)
+}
+
+// test cases about scale
+var testCasesBasicScale = []ncTestCase{
 	{
-		Name: "default 2-3-3",
+		Name: "scale with default values",
 		Labels: map[string]string{
-			LabelKeyCategory: "basic",
+			LabelKeyCategory: LabelCategoryBasic,
+			LabelKeyGroup:    LabelGroupScale,
 		},
 		InstallWaitNCOptions: []envfuncsext.NebulaClusterOption{
 			envfuncsext.WithNebulaClusterReadyFuncs(
@@ -133,3 +150,23 @@ var testCasesBasic = []ncTestCase{
 		},
 	},
 }
+
+// test cases about version of graphd｜metad｜storaged
+var testCasesBasicVersion = []ncTestCase{
+	// TODO
+}
+
+// test cases about resources of graphd｜metad｜storaged
+var testCasesBasicResources = []ncTestCase{
+	// TODO
+}
+
+// test cases about image of graphd｜metad｜storaged
+var testCasesBasicImage = []ncTestCase{
+	// TODO
+}
+
+// test cases about log and data volume of graphd｜metad｜storaged
+var testCasesBasicVolume = []ncTestCase{
+	// TODO
+}
diff --git a/tests/e2e/nebulacluster_test.go b/tests/e2e/nebulacluster_test.go
@@ -67,9 +67,8 @@ func TestNebulaCluster(t *testing.T) {
 		namespace := envconf.RandomName(fmt.Sprintf("e2e-nc-%d", caseIdx), 32)
 		name := envconf.RandomName(fmt.Sprintf("e2e-nc-%d", caseIdx), 32)
 
-		feature := features.New(fmt.Sprintf("Create NebulaCluster %s", tc.Name))
+		feature := features.New(tc.Name)
 
-		feature.WithLabel(LabelKeyCase, tc.Name)
 		for key, value := range tc.Labels {
 			feature.WithLabel(key, value)
 		}