Merge pull request #29846 from eggfoobar/rename-two-node-tests

OCPEDGE-1922: feat: rename and move arbiter tests

Author: openshift-merge-bot[bot]

test/extended/include.go

@@ -9,7 +9,6 @@ import (
 	_ "github.com/openshift/origin/test/e2e/upgrade"
 	_ "github.com/openshift/origin/test/extended/adminack"
 	_ "github.com/openshift/origin/test/extended/apiserver"
-	_ "github.com/openshift/origin/test/extended/arbiter_topology"
 	_ "github.com/openshift/origin/test/extended/authentication"
 	_ "github.com/openshift/origin/test/extended/authorization"
 	_ "github.com/openshift/origin/test/extended/authorization/rbac"
@@ -58,6 +57,7 @@ import (
 	_ "github.com/openshift/origin/test/extended/storage"
 	_ "github.com/openshift/origin/test/extended/tbr_health"
 	_ "github.com/openshift/origin/test/extended/templates"
+	_ "github.com/openshift/origin/test/extended/two_node"
 	_ "github.com/openshift/origin/test/extended/user"
 	_ "github.com/openshift/origin/test/extended/windows"
 )

test/extended/arbiter_topology/OWNERS test/extended/two_node/OWNERStest/extended/arbiter_topology/OWNERS renamed to test/extended/two_node/OWNERS

@@ -33,7 +33,7 @@ var (
 	}
 )
 
-var _ = g.Describe("[sig-node][apigroup:config.openshift.io] expected Master and Arbiter node counts", func() {
+var _ = g.Describe("[sig-node][apigroup:config.openshift.io][OCPFeatureGate:HighlyAvailableArbiter] expected Master and Arbiter node counts", func() {
 	defer g.GinkgoRecover()
 	oc := exutil.NewCLIWithoutNamespace("")
 
@@ -66,7 +66,7 @@ var _ = g.Describe("[sig-node][apigroup:config.openshift.io] expected Master and
 	})
 })
 
-var _ = g.Describe("[sig-node][apigroup:config.openshift.io] required pods on the Arbiter node", func() {
+var _ = g.Describe("[sig-node][apigroup:config.openshift.io][OCPFeatureGate:HighlyAvailableArbiter] required pods on the Arbiter node", func() {
 	defer g.GinkgoRecover()
 
 	var (
@@ -110,7 +110,7 @@ var _ = g.Describe("[sig-node][apigroup:config.openshift.io] required pods on th
 	})
 })
 
-var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io] Deployments on HighlyAvailableArbiterMode topology", func() {
+var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:HighlyAvailableArbiter] Deployments on HighlyAvailableArbiterMode topology", func() {
 	defer g.GinkgoRecover()
 
 	oc := exutil.NewCLI("arbiter-pod-validation").SetManagedNamespace().AsAdmin()
@@ -202,7 +202,7 @@ var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io] Deployments on Highly
 	})
 })
 
-var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io] Evaluate DaemonSet placement in HighlyAvailableArbiterMode topology", func() {
+var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:HighlyAvailableArbiter] Evaluate DaemonSet placement in HighlyAvailableArbiterMode topology", func() {
 	defer g.GinkgoRecover()
 	oc := exutil.NewCLI("daemonset-pod-validation").SetManagedNamespace().AsAdmin()
 
@@ -252,7 +252,7 @@ var _ = g.Describe("[sig-apps][apigroup:apps.openshift.io] Evaluate DaemonSet pl
 	})
 })
 
-var _ = g.Describe("[sig-etcd][apigroup:config.openshift.io] Ensure etcd health and quorum in HighlyAvailableArbiterMode", func() {
+var _ = g.Describe("[sig-etcd][apigroup:config.openshift.io][OCPFeatureGate:HighlyAvailableArbiter] Ensure etcd health and quorum in HighlyAvailableArbiterMode", func() {
 	defer g.GinkgoRecover()
 	oc := exutil.NewCLIWithoutNamespace("").AsAdmin()
 

…ded/arbiter_topology/arbiter_topology.go …st/extended/two_node/arbiter_topology.gotest/extended/arbiter_topology/arbiter_topology.go renamed to test/extended/two_node/arbiter_topology.go test/extended/arbiter_topology/arbiter_topology.go renamed to test/extended/two_node/arbiter_topology.go

@@ -99,6 +99,26 @@ spec:
         set the hardware speed to Slower [Timeout:30m][apigroup:machine.openshift.io]'
     - testName: '[sig-etcd][OCPFeatureGate:HardwareSpeed][Serial] etcd is able to
         set the hardware speed to Standard [Timeout:30m][apigroup:machine.openshift.io]'
+  - featureGate: HighlyAvailableArbiter
+    tests:
+    - testName: '[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:HighlyAvailableArbiter]
+        Deployments on HighlyAvailableArbiterMode topology should be created on arbiter
+        nodes when arbiter node is selected'
+    - testName: '[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:HighlyAvailableArbiter]
+        Deployments on HighlyAvailableArbiterMode topology should be created on master
+        nodes when no node selected'
+    - testName: '[sig-apps][apigroup:apps.openshift.io][OCPFeatureGate:HighlyAvailableArbiter]
+        Evaluate DaemonSet placement in HighlyAvailableArbiterMode topology should
+        not create a DaemonSet on the Arbiter node'
+    - testName: '[sig-etcd][apigroup:config.openshift.io][OCPFeatureGate:HighlyAvailableArbiter]
+        Ensure etcd health and quorum in HighlyAvailableArbiterMode should have all
+        etcd pods running and quorum met'
+    - testName: '[sig-node][apigroup:config.openshift.io][OCPFeatureGate:HighlyAvailableArbiter]
+        expected Master and Arbiter node counts Should validate that there are Master
+        and Arbiter nodes as specified in the cluster'
+    - testName: '[sig-node][apigroup:config.openshift.io][OCPFeatureGate:HighlyAvailableArbiter]
+        required pods on the Arbiter node Should verify that the correct number of
+        pods are running on the Arbiter node'
   - featureGate: HonorPVReclaimPolicy
     tests:
     - testName: '[sig-storage] CSI Mock honor pv reclaim policy [Feature:HonorPVReclaimPolicy]