github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63947 from jennybuckley/aggr-conf-test

Browse Source 
Promote aggregator e2e test to conformance
This commit is contained in:
Kubernetes Prow Robot 2019-02-25 17:25:02 -08:00 committed by GitHub
commit d532d50e29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/conformance/testdata/conformance.txt vendored
View File

@ -1,3 +1,4 @@
test/e2e/apimachinery/aggregator.go: "Should be able to support the 1.10 Sample API Server using the current Aggregator"
test/e2e/apimachinery/custom_resource_definition.go: "creating/deleting custom resource definition objects works" test/e2e/apimachinery/custom_resource_definition.go: "creating/deleting custom resource definition objects works"
test/e2e/apimachinery/garbage_collector.go: "should delete pods created by rc when not orphaning" test/e2e/apimachinery/garbage_collector.go: "should delete pods created by rc when not orphaning"
test/e2e/apimachinery/garbage_collector.go: "should orphan pods created by rc if delete options say so" test/e2e/apimachinery/garbage_collector.go: "should orphan pods created by rc if delete options say so"

11
test/e2e/apimachinery/aggregator.go
View File

@ -72,11 +72,12 @@ var _ = SIGDescribe("Aggregator", func() {
aggrclient = f.AggregatorClient aggrclient = f.AggregatorClient
}) })
It("Should be able to support the 1.10 Sample API Server using the current Aggregator", func() { /*
// Make sure the relevant provider supports Aggregator Testname: aggregator-supports-the-sample-apiserver
framework.SkipUnlessServerVersionGTE(serverAggregatorVersion, f.ClientSet.Discovery()) Description: Ensure that the sample-apiserver code from 1.10 and compiled against 1.10
framework.SkipUnlessProviderIs("gce", "gke") will work on the current Aggregator/API-Server.
*/
framework.ConformanceIt("Should be able to support the 1.10 Sample API Server using the current Aggregator", func() {
// Testing a 1.10 version of the sample-apiserver // Testing a 1.10 version of the sample-apiserver
TestSampleAPIServer(f, imageutils.GetE2EImage(imageutils.APIServer)) TestSampleAPIServer(f, imageutils.GetE2EImage(imageutils.APIServer))
}) })