github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40609 from copejon/pv-e2e-remove-flaky

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40527, 40738, 39366, 40609, 40748)

Removed Flaky tag from PV e2e, added [Volume] to disruptive PV e2e

**What this PR does / why we need it**:
Removes `[Flaky]` from PV e2e testing.  Flakes were due to interference from an external test disrupting a cluster node.  The test has been [removed](9f36c032de) and the flakes have [cleared](https://k8s-testgrid.appspot.com/google-gce#gce-flaky).

Secondly, added `[Volume]` tag to PV disruptive tests.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #39119

**Release note**:
NONE
```release-note
```
This commit is contained in:
Kubernetes Submit Queue
2017-01-31 15:49:45 -08:00
committed by GitHub
parent 36809e2c2e 00a1cbd2dc
commit a17c93627c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/persistent_volumes-disruptive.go
View File

@@ -47,7 +47,7 @@ const (
kRestart kubeletOpt = "restart" kRestart kubeletOpt = "restart"
) )
var _ = framework.KubeDescribe("PersistentVolumes [Disruptive]", func() { var _ = framework.KubeDescribe("PersistentVolumes [Volume][Disruptive]", func() {
f := framework.NewDefaultFramework("disruptive-pv") f := framework.NewDefaultFramework("disruptive-pv")
var ( var (

20
test/e2e/persistent_volumes.go
View File

@@ -72,7 +72,7 @@ func completeMultiTest(f *framework.Framework, c clientset.Interface, ns string,
deletePVCandValidatePVGroup(c, ns, pvols, claims) deletePVCandValidatePVGroup(c, ns, pvols, claims)
} }
var _ = framework.KubeDescribe("PersistentVolumes", func() { var _ = framework.KubeDescribe("PersistentVolumes [Volume][Serial]", func() {
// global vars for the Context()s and It()'s below // global vars for the Context()s and It()'s below
f := framework.NewDefaultFramework("pv") f := framework.NewDefaultFramework("pv")
@@ -153,7 +153,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Create an nfs PV, then a claim that matches the PV, and a pod that // Create an nfs PV, then a claim that matches the PV, and a pod that
// contains the claim. Verify that the PV and PVC bind correctly, and // contains the claim. Verify that the PV and PVC bind correctly, and
// that the pod can write to the nfs volume. // that the pod can write to the nfs volume.
It("should create a non-pre-bound PV and PVC: test write access [Volume][Serial][Flaky]", func() { It("should create a non-pre-bound PV and PVC: test write access ", func() {
pv, pvc = createPVPVC(c, pvConfig, ns, false) pv, pvc = createPVPVC(c, pvConfig, ns, false)
completeTest(f, c, ns, pv, pvc) completeTest(f, c, ns, pv, pvc)
}) })
@@ -161,7 +161,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Create a claim first, then a nfs PV that matches the claim, and a // Create a claim first, then a nfs PV that matches the claim, and a
// pod that contains the claim. Verify that the PV and PVC bind // pod that contains the claim. Verify that the PV and PVC bind
// correctly, and that the pod can write to the nfs volume. // correctly, and that the pod can write to the nfs volume.
It("create a PVC and non-pre-bound PV: test write access [Volume][Serial][Flaky]", func() { It("create a PVC and non-pre-bound PV: test write access", func() {
pv, pvc = createPVCPV(c, pvConfig, ns, false) pv, pvc = createPVCPV(c, pvConfig, ns, false)
completeTest(f, c, ns, pv, pvc) completeTest(f, c, ns, pv, pvc)
}) })
@@ -169,7 +169,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Create a claim first, then a pre-bound nfs PV that matches the claim, // Create a claim first, then a pre-bound nfs PV that matches the claim,
// and a pod that contains the claim. Verify that the PV and PVC bind // and a pod that contains the claim. Verify that the PV and PVC bind
// correctly, and that the pod can write to the nfs volume. // correctly, and that the pod can write to the nfs volume.
It("create a PVC and a pre-bound PV: test write access [Volume][Serial][Flaky]", func() { It("create a PVC and a pre-bound PV: test write access", func() {
pv, pvc = createPVCPV(c, pvConfig, ns, true) pv, pvc = createPVCPV(c, pvConfig, ns, true)
completeTest(f, c, ns, pv, pvc) completeTest(f, c, ns, pv, pvc)
}) })
@@ -177,7 +177,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Create a nfs PV first, then a pre-bound PVC that matches the PV, // Create a nfs PV first, then a pre-bound PVC that matches the PV,
// and a pod that contains the claim. Verify that the PV and PVC bind // and a pod that contains the claim. Verify that the PV and PVC bind
// correctly, and that the pod can write to the nfs volume. // correctly, and that the pod can write to the nfs volume.
It("create a PV and a pre-bound PVC: test write access [Volume][Serial][Flaky]", func() { It("create a PV and a pre-bound PVC: test write access", func() {
pv, pvc = createPVPVC(c, pvConfig, ns, true) pv, pvc = createPVPVC(c, pvConfig, ns, true)
completeTest(f, c, ns, pv, pvc) completeTest(f, c, ns, pv, pvc)
}) })
@@ -208,7 +208,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Create 2 PVs and 4 PVCs. // Create 2 PVs and 4 PVCs.
// Note: PVs are created before claims and no pre-binding // Note: PVs are created before claims and no pre-binding
It("should create 2 PVs and 4 PVCs: test write access [Volume][Serial][Flaky]", func() { It("should create 2 PVs and 4 PVCs: test write access", func() {
numPVs, numPVCs := 2, 4 numPVs, numPVCs := 2, 4
pvols, claims = createPVsPVCs(numPVs, numPVCs, c, ns, pvConfig) pvols, claims = createPVsPVCs(numPVs, numPVCs, c, ns, pvConfig)
waitAndVerifyBinds(c, ns, pvols, claims, true) waitAndVerifyBinds(c, ns, pvols, claims, true)
@@ -217,7 +217,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Create 3 PVs and 3 PVCs. // Create 3 PVs and 3 PVCs.
// Note: PVs are created before claims and no pre-binding // Note: PVs are created before claims and no pre-binding
It("should create 3 PVs and 3 PVCs: test write access [Volume][Serial][Flaky]", func() { It("should create 3 PVs and 3 PVCs: test write access", func() {
numPVs, numPVCs := 3, 3 numPVs, numPVCs := 3, 3
pvols, claims = createPVsPVCs(numPVs, numPVCs, c, ns, pvConfig) pvols, claims = createPVsPVCs(numPVs, numPVCs, c, ns, pvConfig)
waitAndVerifyBinds(c, ns, pvols, claims, true) waitAndVerifyBinds(c, ns, pvols, claims, true)
@@ -226,7 +226,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Create 4 PVs and 2 PVCs. // Create 4 PVs and 2 PVCs.
// Note: PVs are created before claims and no pre-binding. // Note: PVs are created before claims and no pre-binding.
It("should create 4 PVs and 2 PVCs: test write access [Volume][Serial][Flaky]", func() { It("should create 4 PVs and 2 PVCs: test write access", func() {
numPVs, numPVCs := 4, 2 numPVs, numPVCs := 4, 2
pvols, claims = createPVsPVCs(numPVs, numPVCs, c, ns, pvConfig) pvols, claims = createPVsPVCs(numPVs, numPVCs, c, ns, pvConfig)
waitAndVerifyBinds(c, ns, pvols, claims, true) waitAndVerifyBinds(c, ns, pvols, claims, true)
@@ -287,7 +287,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Attach a persistent disk to a pod using a PVC. // Attach a persistent disk to a pod using a PVC.
// Delete the PVC and then the pod. Expect the pod to succeed in unmounting and detaching PD on delete. // Delete the PVC and then the pod. Expect the pod to succeed in unmounting and detaching PD on delete.
It("should test that deleting a PVC before the pod does not cause pod deletion to fail on PD detach [Volume][Serial][Flaky]", func() { It("should test that deleting a PVC before the pod does not cause pod deletion to fail on PD detach", func() {
By("Creating the PV and PVC") By("Creating the PV and PVC")
pv, pvc = createPVPVC(c, pvConfig, ns, false) pv, pvc = createPVPVC(c, pvConfig, ns, false)
waitOnPVandPVC(c, ns, pv, pvc) waitOnPVandPVC(c, ns, pv, pvc)
@@ -310,7 +310,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Attach a persistent disk to a pod using a PVC. // Attach a persistent disk to a pod using a PVC.
// Delete the PV and then the pod. Expect the pod to succeed in unmounting and detaching PD on delete. // Delete the PV and then the pod. Expect the pod to succeed in unmounting and detaching PD on delete.
It("should test that deleting the PV before the pod does not cause pod deletion to fail on PD detach [Volume][Serial][Flaky]", func() { It("should test that deleting the PV before the pod does not cause pod deletion to fail on PD detach", func() {
By("Creating the PV and PVC") By("Creating the PV and PVC")
pv, pvc = createPVPVC(c, pvConfig, ns, false) pv, pvc = createPVPVC(c, pvConfig, ns, false)
waitOnPVandPVC(c, ns, pv, pvc) waitOnPVandPVC(c, ns, pv, pvc)