mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 14:07:14 +00:00
Merge pull request #56790 from foxish/disable-gce-target
Automatic merge from submit-queue (batch tested with PRs 56790, 56638). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Disable GCE target for network partition tests Disabling until https://github.com/kubernetes/kubernetes/issues/56787 is addressed.
This commit is contained in:
commit
0962fb092e
@ -116,6 +116,9 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
|
|||||||
systemPods, err := framework.GetPodsInNamespace(c, ns, ignoreLabels)
|
systemPods, err := framework.GetPodsInNamespace(c, ns, ignoreLabels)
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
systemPodsNo = int32(len(systemPods))
|
systemPodsNo = int32(len(systemPods))
|
||||||
|
|
||||||
|
// TODO(foxish): Re-enable testing on gce after kubernetes#56787 is fixed.
|
||||||
|
framework.SkipUnlessProviderIs("gke", "aws")
|
||||||
if strings.Index(framework.TestContext.CloudConfig.NodeInstanceGroup, ",") >= 0 {
|
if strings.Index(framework.TestContext.CloudConfig.NodeInstanceGroup, ",") >= 0 {
|
||||||
framework.Failf("Test dose not support cluster setup with more than one MIG: %s", framework.TestContext.CloudConfig.NodeInstanceGroup)
|
framework.Failf("Test dose not support cluster setup with more than one MIG: %s", framework.TestContext.CloudConfig.NodeInstanceGroup)
|
||||||
} else {
|
} else {
|
||||||
@ -126,7 +129,6 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
|
|||||||
framework.KubeDescribe("Pods", func() {
|
framework.KubeDescribe("Pods", func() {
|
||||||
Context("should return to running and ready state after network partition is healed", func() {
|
Context("should return to running and ready state after network partition is healed", func() {
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
framework.SkipUnlessProviderIs("gce", "gke", "aws")
|
|
||||||
framework.SkipUnlessNodeCountIsAtLeast(2)
|
framework.SkipUnlessNodeCountIsAtLeast(2)
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -347,7 +349,8 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
|
|||||||
headlessSvcName := "test"
|
headlessSvcName := "test"
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
framework.SkipUnlessProviderIs("gce", "gke")
|
// TODO(foxish): Re-enable testing on gce after kubernetes#56787 is fixed.
|
||||||
|
framework.SkipUnlessProviderIs("gke")
|
||||||
By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name)
|
By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name)
|
||||||
headlessService := framework.CreateServiceSpec(headlessSvcName, "", true, labels)
|
headlessService := framework.CreateServiceSpec(headlessSvcName, "", true, labels)
|
||||||
_, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(headlessService)
|
_, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(headlessService)
|
||||||
@ -461,7 +464,6 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() {
|
|||||||
framework.KubeDescribe("Pods", func() {
|
framework.KubeDescribe("Pods", func() {
|
||||||
Context("should be evicted from unready Node", func() {
|
Context("should be evicted from unready Node", func() {
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
framework.SkipUnlessProviderIs("gce", "gke", "aws")
|
|
||||||
framework.SkipUnlessNodeCountIsAtLeast(2)
|
framework.SkipUnlessNodeCountIsAtLeast(2)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user