Merge pull request #48978 from davidopp/test_fixit

Automatic merge from submit-queue (batch tested with PRs 46318, 48978)

Mark sig-scheduling tests with [sig-scheduling] so they can be selected for the testdash dashboard

**What this PR does / why we need it**:
Mark sig-scheduling tests with [sig-scheduling] so they can be selected for the testdash dashboard
(see kubernetes/test-infra#3529 for sig-scheduling dashboard definition).

cc/ @bsalamat @kubernetes/sig-scheduling-pr-reviews
pull/6/head
Kubernetes Submit Queue 2017-07-15 12:23:36 -07:00 committed by GitHub
commit e1ba93f27f
6 changed files with 28 additions and 4 deletions

View File

@ -11,6 +11,7 @@ go_library(
name = "go_default_library",
srcs = [
"events.go",
"framework.go",
"opaque_resource.go",
"predicates.go",
"priorities.go",

View File

@ -0,0 +1,23 @@
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package scheduling
import "github.com/onsi/ginkgo"
func SIGDescribe(text string, body func()) bool {
return ginkgo.Describe("[sig-scheduling] "+text, body)
}

View File

@ -33,7 +33,7 @@ import (
. "github.com/onsi/gomega"
)
var _ = framework.KubeDescribe("Opaque resources [Feature:OpaqueResources]", func() {
var _ = SIGDescribe("Opaque resources [Feature:OpaqueResources]", func() {
f := framework.NewDefaultFramework("opaque-resource")
opaqueResName := v1helper.OpaqueIntResourceName("foo")
var node *v1.Node

View File

@ -53,7 +53,7 @@ type pausePodConfig struct {
NodeName string
}
var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
var cs clientset.Interface
var nodeList *v1.NodeList
var systemPodsNo int

View File

@ -57,7 +57,7 @@ var podRequestedResource *v1.ResourceRequirements = &v1.ResourceRequirements{
}
// This test suite is used to verifies scheduler priority functions based on the default provider
var _ = framework.KubeDescribe("SchedulerPriorities [Serial]", func() {
var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
var cs clientset.Interface
var nodeList *v1.NodeList
var systemPodsNo int

View File

@ -36,7 +36,7 @@ const (
)
// This test requires Rescheduler to be enabled.
var _ = framework.KubeDescribe("Rescheduler [Serial]", func() {
var _ = SIGDescribe("Rescheduler [Serial]", func() {
f := framework.NewDefaultFramework("rescheduler")
var ns string
var totalMillicores int