Merge pull request #13076 from bparees/conformance

Merged by openshift-bot

Author: OpenShift Bot

test/extended/image_ecosystem/mongodb_replica_statefulset.go

@@ -12,7 +12,7 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 )
 
-var _ = g.Describe("[image_ecosystem][mongodb][Slow] openshift mongodb replication (with statefulset)", func() {
+var _ = g.Describe("[Conformance][image_ecosystem][mongodb][Slow] openshift mongodb replication (with statefulset)", func() {
 	defer g.GinkgoRecover()
 
 	const templatePath = "https://raw.githubusercontent.com/sclorg/mongodb-container/master/examples/petset/mongodb-petset-persistent.yaml"

test/extended/localquota/local_fsgroup_quota.go

@@ -115,7 +115,7 @@ func waitForQuotaToBeApplied(oc *exutil.CLI, fsGroup int, volDir string) error {
 	return fmt.Errorf("expected quota was not applied in time")
 }
 
-var _ = g.Describe("[volumes] Test local storage quota", func() {
+var _ = g.Describe("[Conformance][volumes] Test local storage quota", func() {
 	defer g.GinkgoRecover()
 	var (
 		oc                 = exutil.NewCLI("local-quota", exutil.KubeConfigPath())

test/extended/registry/registry.go

@@ -25,7 +25,7 @@ const (
 	imageSize = 1024
 )
 
-var _ = g.Describe("[registry][migration] manifest migration from etcd to registry storage", func() {
+var _ = g.Describe("[Conformance][registry][migration] manifest migration from etcd to registry storage", func() {
 	defer g.GinkgoRecover()
 	var oc = exutil.NewCLI("registry-migration", exutil.KubeConfigPath())
 

test/extended/router/scoped.go

@@ -19,7 +19,7 @@ import (
 
 const changeTimeoutSeconds = 3 * 60
 
-var _ = g.Describe("[networking][router] openshift routers", func() {
+var _ = g.Describe("[Conformance][networking][router] openshift routers", func() {
 	defer g.GinkgoRecover()
 	var (
 		configPath = exutil.FixturePath("testdata", "scoped-router.yaml")

test/extended/router/weighted.go

@@ -18,7 +18,7 @@ import (
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
-var _ = g.Describe("[networking][router] weighted openshift router", func() {
+var _ = g.Describe("[Conformance][networking][router] weighted openshift router", func() {
 	defer g.GinkgoRecover()
 	var (
 		configPath = exutil.FixturePath("testdata", "weighted-router.yaml")

test/extended/security/supplemental_groups.go

@@ -21,7 +21,7 @@ var _ = g.Describe("[security] supplemental groups", func() {
 		f = e2e.NewDefaultFramework("security-supgroups")
 	)
 
-	g.Describe("Ensure supplemental groups propagate to docker", func() {
+	g.Describe("[Conformance]Ensure supplemental groups propagate to docker", func() {
 		g.It("should propagate requested groups to the docker host config [local]", func() {
 			g.By("getting the docker client")
 			dockerCli, err := testutil.NewDockerClient()

test/extended/setup.sh

@@ -352,12 +352,8 @@ readonly SERIAL_TESTS=(
 
 readonly CONFORMANCE_TESTS=(
 	"\[Conformance\]"
-
 	"Services.*NodePort"
 	"ResourceQuota should"
-	"\[networking\] basic openshift networking"
-	"\[networking\]\[router\]"
-	"Ensure supplemental groups propagate to docker"
 	"EmptyDir"
 	"StatefulSet"
 	"Downward API"
@@ -368,18 +364,12 @@ readonly CONFORMANCE_TESTS=(
 	"Pods should support retrieving logs from the container"
 	"Kubectl client Simple pod should support"
 	"Job should run a job to completion when tasks succeed"
-	"\[images\]\[mongodb\] openshift mongodb replication"
-	"\[job\] openshift can execute jobs controller"
-	"\[volumes\] Test local storage quota FSGroup"
-	"test deployment should run a deployment to completion"
 	"Variable Expansion"
 	"init containers"
 	"Clean up pods on node kubelet"
 	"\[Feature\:SecurityContext\]"
 	"should create a LimitRange with defaults"
 	"Generated release_1_2 clientset"
-	"\[Feature\:PodDisruptionbudget\]"
 	"should create a pod that reads a secret"
 	"should create a pod that prints his name and namespace"
-	"manifest migration from etcd to registry storage"
 )