mirror of https://github.com/k3s-io/k3s
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-reviewspull/6/head
commit
e1ba93f27f
|
@ -11,6 +11,7 @@ go_library(
|
||||||
name = "go_default_library",
|
name = "go_default_library",
|
||||||
srcs = [
|
srcs = [
|
||||||
"events.go",
|
"events.go",
|
||||||
|
"framework.go",
|
||||||
"opaque_resource.go",
|
"opaque_resource.go",
|
||||||
"predicates.go",
|
"predicates.go",
|
||||||
"priorities.go",
|
"priorities.go",
|
||||||
|
|
|
@ -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)
|
||||||
|
}
|
|
@ -33,7 +33,7 @@ import (
|
||||||
. "github.com/onsi/gomega"
|
. "github.com/onsi/gomega"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ = framework.KubeDescribe("Opaque resources [Feature:OpaqueResources]", func() {
|
var _ = SIGDescribe("Opaque resources [Feature:OpaqueResources]", func() {
|
||||||
f := framework.NewDefaultFramework("opaque-resource")
|
f := framework.NewDefaultFramework("opaque-resource")
|
||||||
opaqueResName := v1helper.OpaqueIntResourceName("foo")
|
opaqueResName := v1helper.OpaqueIntResourceName("foo")
|
||||||
var node *v1.Node
|
var node *v1.Node
|
||||||
|
|
|
@ -53,7 +53,7 @@ type pausePodConfig struct {
|
||||||
NodeName string
|
NodeName string
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
|
var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
|
||||||
var cs clientset.Interface
|
var cs clientset.Interface
|
||||||
var nodeList *v1.NodeList
|
var nodeList *v1.NodeList
|
||||||
var systemPodsNo int
|
var systemPodsNo int
|
||||||
|
|
|
@ -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
|
// 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 cs clientset.Interface
|
||||||
var nodeList *v1.NodeList
|
var nodeList *v1.NodeList
|
||||||
var systemPodsNo int
|
var systemPodsNo int
|
||||||
|
|
|
@ -36,7 +36,7 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
// This test requires Rescheduler to be enabled.
|
// This test requires Rescheduler to be enabled.
|
||||||
var _ = framework.KubeDescribe("Rescheduler [Serial]", func() {
|
var _ = SIGDescribe("Rescheduler [Serial]", func() {
|
||||||
f := framework.NewDefaultFramework("rescheduler")
|
f := framework.NewDefaultFramework("rescheduler")
|
||||||
var ns string
|
var ns string
|
||||||
var totalMillicores int
|
var totalMillicores int
|
||||||
|
|
Loading…
Reference in New Issue