Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing e2e test to allow other test to run post one test faliure #471

Merged
merged 2 commits into from
Nov 4, 2020
Merged

Fixing e2e test to allow other test to run post one test faliure #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd9dc3b
fixed failing test
Nov 4, 2020
c159792
fixed e2e est
Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl get nodes"
- ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "mkdir /data;kubectl create -f /root/pravega-operator/test/e2e/resources/local-storage.yaml"
- ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "curl -L https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash"
- ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "helm repo add stable https://kubernetes-charts.storage.googleapis.com;helm install stable/nfs-server-provisioner --generate-name;kubectl -n default create -f /root/pravega-operator/test/e2e/resources/tier2.yaml"
- ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "helm repo add stable https://charts.helm.sh/stable;helm install stable/nfs-server-provisioner --generate-name;kubectl -n default create -f /root/pravega-operator/test/e2e/resources/tier2.yaml"

- ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl create -f /root/pravega-operator/test/e2e/resources/zookeeper.yaml"
- ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create -f /root/pravega-operator/test/e2e/resources/bookkeeper.yaml"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Check out the available [options for long term storage](doc/longtermstorage.md)
For demo purposes, you can quickly install a toy NFS server.

```
$ helm repo add stable https://kubernetes-charts.storage.googleapis.com
$ helm repo add stable https://charts.helm.sh/stable
$ helm repo update
$ helm install stable/nfs-server-provisioner --generate-name
```
Expand Down
10 changes: 7 additions & 3 deletions pkg/test/e2e/e2eutil/pravegacluster_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,9 +614,13 @@ func RestartTier2(t *testing.T, f *framework.Framework, ctx *framework.TestCtx,
t.Log("restarting tier2 storage")
tier2 := NewTier2(namespace)

err := f.Client.Delete(goctx.TODO(), tier2)
if err != nil {
return fmt.Errorf("failed to delete tier2: %v", err)
_, err := f.KubeClient.CoreV1().PersistentVolumeClaims(namespace).Get(tier2.Name, metav1.GetOptions{})

if err == nil {
err := f.Client.Delete(goctx.TODO(), tier2)
if err != nil {
return fmt.Errorf("failed to delete tier2: %v", err)
}
}

err = wait.Poll(RetryInterval, 3*time.Minute, func() (done bool, err error) {
Expand Down