Skip to content

Commit 72fd1b8

Browse files
Prabhaker24prabhaker24
Prabhaker24
and
prabhaker24
authored
Issue- 178: E2E tests fixed and Travis support added (#211)
* ete tests fixed and travis support added Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed minikube version Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * fixed travis.yaml Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changing minikube version Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed kubernetes version Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed minikube version Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed travis.yaml file Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * incresing minikube resources Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed retry timeout Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * checking upgrade ete Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * adding create reacreate ete Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * scale test added Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed travis.yaml Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added scale cluster ete Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added multiplezk ete Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added multiplezk ete Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added multiplezk ete Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * all ete test added Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added debug level logs Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added debug level logs Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added debug level logs Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added all tests back Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * checking upgradetest Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * upgrade version changed Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * all test added Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * logs removed Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * commented multizk test Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * multizk test added back Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed replica count for multizk to 3 Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * fixed travis.yaml Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * get added in multizktest Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * testing multizk Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed back multizk test Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed back multizk test Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * testing multizk test Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * aaded back all the tests Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed travis.yaml Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changed travis.yaml Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changing travis.yaml to run for on pr Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changing travis.yaml to run for on pr Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * changing travis.yaml to run for on pr Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> * added test local command in makefile Signed-off-by: prabhaker24 <prabhaker.saxena@dell.com> Co-authored-by: prabhaker24 <prabhaker.saxena@dell.com>
1 parent db0e746 commit 72fd1b8

File tree

7 files changed

+95
-45
lines changed

7 files changed

+95
-45
lines changed

‎.travis.yml‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,40 @@
11
language: go
22
go:
33
- '1.13.8'
4-
- tip
54
sudo: required
65
env:
7-
global:
6+
global:
7+
- KUBERNETES_VERSION=v1.15.0
8+
- OPERATOR_SDK_VERSION=v0.17.0
9+
- KUBERNETES_CONFIG_FILE=$HOME/.kube/config
10+
- CHANGE_MINIKUBE_NONE_USER=true
11+
- MINIKUBE_VERSION=v1.11.0
812
secure: dIXvb2BS2AwvQf+McXNClqoV4AjobYyc0/2b+zn4yMQ2v8gAW5V0w8Y3af6EnwOLe9Szke0RRHj/5ktxyrnQtBLsQhZd13GUItLuvIyD1fZZx9/djA7aII71fqKBVLVg2OR9VFltfPDB1B9NSPD3w4NJhyWdAzUORnqiNkQmOc+WGdCVYJ6olXZoq1rCVD+ysxssuWaHVD4ujbdLmwToFhQiGGbpdInZjdLUZ8FWLEJHl5uHkntrHESDBBjZ+ZHeF5jZYEUKjoV0xvapiI+lqp6mcWzaVkop78SbjlHnbQNjqH3mW6i0lI7dRyMPPURUBPNKvhvDlAbRjd7CU70ASJmI2rCgKQru5tfASaegeCzdGCp1fOn4bdvDgL+9NtxsojL6J4j5H9MPmSE6zZVLLQN/wA4IM7vB12o+O7pEM40WiZ7qtCsolIFWE53zx9Beuf7FQFv8Zz/pCfUctvZdyE53T41uuzZVQC+w+w5sj/1rrLgBCjPD1ghNZdN+y3GD7Sgaic03a+FiCTKnOOab9Dk6Pil0m4qbYLJdkKKLt/PvAw7nb9GEX36VPLWrG9xCXsJvzbiG+JQBYEpSQrzJYj9vuNScoWZuvu1I+cRIZsj26dPt9XXn2I/8uQSKBQlNzPAIOD1NCTLtRglVkgPf+BxNppTLV2BmBRQ4V9ZtpJQ=
913
services:
1014
- docker
15+
install:
16+
- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
17+
- curl -Lo minikube https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
18+
- curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/$OPERATOR_SDK_VERSION/operator-sdk-$OPERATOR_SDK_VERSION-x86_64-linux-gnu && chmod +x operator-sdk && sudo mv operator-sdk /usr/local/bin/
19+
before_script:
20+
- sudo mount --make-rshared /
21+
- sudo minikube start --vm-driver=none --bootstrapper=kubeadm --kubernetes-version=$KUBERNETES_VERSION
22+
- minikube update-context
23+
- JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
24+
# Show cluster information
25+
- kubectl create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default
26+
- kubectl cluster-info
27+
- kubectl -n kube-system get pod -o wide
1128
script:
1229
- make check
1330
- make test
14-
- make build
31+
# ping stdout every 5 minutes or Travis kills build
32+
# ref: https://docs.travis-ci.com/user/common-build-problems/#build-times-out-because-no-output-was-received
33+
- while sleep 5m; do kubectl get pods; done &
34+
- echo "$TRAVIS_PULL_REQUEST"
35+
- if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then make test-e2e; fi
36+
# kill background echo loop
37+
- echo "killing while sleep loop" && kill %1
1538
- make clean
1639
after_success:
1740
- bash <(curl -s https://codecov.io/bash)

‎Makefile‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ EXPORTER_NAME=zookeeper-exporter
1313
APP_NAME=zookeeper
1414
KUBE_VERSION=1.17.5
1515
REPO=pravega/$(PROJECT_NAME)
16-
TEST_REPO=$(DOCKER_USER)/$(PROJECT_NAME)
16+
TEST_REPO=testzkop/$(PROJECT_NAME)
1717
APP_REPO=pravega/$(APP_NAME)
1818
ALTREPO=emccorp/$(PROJECT_NAME)
1919
APP_ALTREPO=emccorp/$(APP_NAME)
2020
VERSION=$(shell git describe --always --tags --dirty | sed "s/\(.*\)-g`git rev-parse --short HEAD`/\1/")
2121
GIT_SHA=$(shell git rev-parse --short HEAD)
2222
TEST_IMAGE=$(TEST_REPO)-testimages:$(VERSION)
23+
DOCKER_TEST_PASS=testzkop@123
24+
DOCKER_TEST_USER=testzkop
2325

2426
.PHONY: all build check clean test
2527

@@ -56,26 +58,35 @@ build-zk-image:
5658

5759
build-zk-image-swarm:
5860
docker build --build-arg VERSION=$(VERSION)-swarm --build-arg GIT_SHA=$(GIT_SHA) -f ./docker/Dockerfile-swarm -t $(APP_REPO):$(VERSION)-swarm ./docker
59-
61+
6062
test:
6163
go test $$(go list ./... | grep -v /vendor/ | grep -v /test/e2e) -race -coverprofile=coverage.txt -covermode=atomic
6264

63-
test-e2e-remote: login
64-
operator-sdk build $(TEST_IMAGE) --namespaced-manifest ./deploy/all_ns/operator.yaml --enable-tests
65+
test-e2e: test-e2e-remote
66+
67+
test-e2e-remote: test-login
68+
operator-sdk build $(TEST_IMAGE)
6569
docker push $(TEST_IMAGE)
66-
operator-sdk test local ./test/e2e --namespace default --namespaced-manifest ./test/e2e/resources/rbac-operator.yaml --global-manifest deploy/crds/zookeeper_v1beta1_zookeepercluster_crd.yaml --image $(TEST_IMAGE) --go-test-flags "-v -timeout 0"
70+
operator-sdk test local ./test/e2e --operator-namespace default --namespaced-manifest ./test/e2e/resources/rbac-operator.yaml --global-manifest deploy/crds/zookeeper_v1beta1_zookeepercluster_crd.yaml --image $(TEST_IMAGE) --go-test-flags "-v -timeout 0"
71+
72+
test-e2e-local:
73+
operator-sdk test local ./test/e2e --operator-namespace default --up-local --go-test-flags "-v -timeout 0"
6774

6875
run-local:
6976
operator-sdk up local
77+
7078
login:
7179
@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)"
7280

81+
test-login:
82+
echo "$(DOCKER_TEST_PASS)" | docker login -u "$(DOCKER_TEST_USER)" --password-stdin
83+
7384
push: build-image build-zk-image build-zk-image-swarm login
7485
docker push $(REPO):$(VERSION)
7586
docker push $(REPO):latest
7687
docker push $(APP_REPO):$(VERSION)
7788
docker push $(APP_REPO):latest
78-
docker push $(APP_REPO):$(VERSION)-swarm
89+
docker push $(APP_REPO):$(VERSION)-swarm
7990
docker tag $(REPO):$(VERSION) $(ALTREPO):$(VERSION)
8091
docker tag $(REPO):$(VERSION) $(ALTREPO):latest
8192
docker tag $(APP_REPO):$(VERSION) $(APP_ALTREPO):$(VERSION)

‎go.mod‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/go-logr/logr v0.1.0
88
github.com/onsi/ginkgo v1.12.0
99
github.com/onsi/gomega v1.9.0
10+
github.com/opennota/check v0.0.0-20180911053232-0c771f5545ff // indirect
1011
github.com/operator-framework/operator-sdk v0.17.0
1112
github.com/pkg/errors v0.9.1
1213
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
@@ -17,52 +18,56 @@ require (
1718
sigs.k8s.io/controller-runtime v0.5.2
1819
)
1920

20-
replace k8s.io/api => k8s.io/api v0.17.5
21+
replace (
22+
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
2123

22-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.5
24+
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
2325

24-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.17.6-beta.0
26+
k8s.io/api => k8s.io/api v0.17.5
2527

26-
replace k8s.io/apiserver => k8s.io/apiserver v0.17.5
28+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.5
2729

28-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.5
30+
k8s.io/apimachinery => k8s.io/apimachinery v0.17.6-beta.0
2931

30-
replace k8s.io/client-go => k8s.io/client-go v0.17.5
32+
k8s.io/apiserver => k8s.io/apiserver v0.17.5
3133

32-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.5
34+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.5
3335

34-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.5
36+
k8s.io/client-go => k8s.io/client-go v0.17.5
3537

36-
replace k8s.io/code-generator => k8s.io/code-generator v0.17.6-beta.0
38+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.5
3739

38-
replace k8s.io/component-base => k8s.io/component-base v0.17.5
40+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.5
3941

40-
replace k8s.io/cri-api => k8s.io/cri-api v0.17.7-rc.0
42+
k8s.io/code-generator => k8s.io/code-generator v0.17.6-beta.0
4143

42-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.5
44+
k8s.io/component-base => k8s.io/component-base v0.17.5
4345

44-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.5
46+
k8s.io/cri-api => k8s.io/cri-api v0.17.7-rc.0
4547

46-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.5
48+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.5
4749

48-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.5
50+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.5
4951

50-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.5
52+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.5
5153

52-
replace k8s.io/kubectl => k8s.io/kubectl v0.17.5
54+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.5
5355

54-
replace k8s.io/kubelet => k8s.io/kubelet v0.17.5
56+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.5
5557

56-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.5
58+
k8s.io/kubectl => k8s.io/kubectl v0.17.5
5759

58-
replace k8s.io/metrics => k8s.io/metrics v0.17.5
60+
k8s.io/kubelet => k8s.io/kubelet v0.17.5
5961

60-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.5
62+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.5
6163

62-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.5
64+
k8s.io/metrics => k8s.io/metrics v0.17.5
6365

64-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.17.5
66+
k8s.io/node-api => k8s.io/node-api v0.17.5
6567

66-
replace k8s.io/node-api => k8s.io/node-api v0.17.5
68+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.5
6769

68-
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
70+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.5
71+
72+
k8s.io/sample-controller => k8s.io/sample-controller v0.17.5
73+
)

‎go.sum‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX
3030
github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
3131
github.com/Azure/go-autorest v11.2.8+incompatible h1:Q2feRPMlcfVcqz3pF87PJzkm5lZrL+x6BDtzhODzNJM=
3232
github.com/Azure/go-autorest v11.2.8+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
33+
github.com/Azure/go-autorest v13.3.2+incompatible h1:VxzPyuhtnlBOzc4IWCZHqpyH2d+QMLQEuy3wREyY4oc=
34+
github.com/Azure/go-autorest v13.3.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
3335
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
3436
github.com/Azure/go-autorest/autorest v0.9.3-0.20191028180845-3492b2aff503 h1:uUhdsDMg2GbFLF5GfQPtLMWd5vdDZSfqvqQp3waafxQ=
3537
github.com/Azure/go-autorest/autorest v0.9.3-0.20191028180845-3492b2aff503/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
3638
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
3739
github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503 h1:Hxqlh1uAA8aGpa1dFhDNhll7U/rkWtG8ZItFvRMr7l0=
3840
github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
3941
github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
42+
github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM=
4043
github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
4144
github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
4245
github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
@@ -45,7 +48,9 @@ github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocm
4548
github.com/Azure/go-autorest/autorest/to v0.3.1-0.20191028180845-3492b2aff503/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA=
4649
github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
4750
github.com/Azure/go-autorest/autorest/validation v0.2.1-0.20191028180845-3492b2aff503/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI=
51+
github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
4852
github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
53+
github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
4954
github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
5055
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
5156
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -209,6 +214,7 @@ github.com/deislabs/oras v0.8.1/go.mod h1:Mx0rMSbBNaNfY9hjpccEnxkOqJL6KGjtxNHPLC
209214
github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
210215
github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
211216
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
217+
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
212218
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
213219
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
214220
github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
@@ -726,6 +732,8 @@ github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.m
726732
github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
727733
github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
728734
github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
735+
github.com/opennota/check v0.0.0-20180911053232-0c771f5545ff h1:lRHufowVGvUvxGsPveAZOpSa/9T5Gpxg6d7UbHCA9MQ=
736+
github.com/opennota/check v0.0.0-20180911053232-0c771f5545ff/go.mod h1:tydB+MZxWpY8M/NRu7jQhND/mXuLAPsKcSV6JkzofsA=
729737
github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87/go.mod h1:fT6U/JfG8uZzemTRwZA2kBDJP5nWz7v05UHnty/D+pk=
730738
github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk=
731739
github.com/openshift/origin v0.0.0-20160503220234-8f127d736703/go.mod h1:0Rox5r9C8aQn6j1oAOQ0c1uC86mYbUFObzjBRvUKHII=

‎pkg/test/e2e/e2eutil/zookeepercluster_util.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ import (
3030
var (
3131
RetryInterval = time.Second * 5
3232
Timeout = time.Second * 60
33-
CleanupRetryInterval = time.Second * 1
33+
CleanupRetryInterval = time.Second * 5
3434
CleanupTimeout = time.Second * 5
3535
ReadyTimeout = time.Minute * 5
3636
UpgradeTimeout = time.Minute * 10
37-
TerminateTimeout = time.Minute * 2
38-
VerificationTimeout = time.Minute * 3
37+
TerminateTimeout = time.Minute * 5
38+
VerificationTimeout = time.Minute * 5
3939
)
4040

4141
// CreateCluster creates a ZookeeperCluster CR with the desired spec
@@ -93,7 +93,6 @@ func GetCluster(t *testing.T, f *framework.Framework, ctx *framework.TestCtx, z
9393
// WaitForClusterToBecomeReady will wait until all cluster pods are ready
9494
func WaitForClusterToBecomeReady(t *testing.T, f *framework.Framework, ctx *framework.TestCtx, z *api.ZookeeperCluster, size int) error {
9595
t.Logf("waiting for cluster pods to become ready: %s", z.Name)
96-
9796
err := wait.Poll(RetryInterval, ReadyTimeout, func() (done bool, err error) {
9897
cluster, err := GetCluster(t, f, ctx, z)
9998
if err != nil {
@@ -161,7 +160,7 @@ func WaitForClusterToTerminate(t *testing.T, f *framework.Framework, ctx *framew
161160

162161
// Wait for Pods to terminate
163162
err := wait.Poll(RetryInterval, TerminateTimeout, func() (done bool, err error) {
164-
podList, err := f.KubeClient.Core().Pods(z.Namespace).List(listOptions)
163+
podList, err := f.KubeClient.CoreV1().Pods(z.Namespace).List(listOptions)
165164
if err != nil {
166165
return false, err
167166
}
@@ -184,7 +183,7 @@ func WaitForClusterToTerminate(t *testing.T, f *framework.Framework, ctx *framew
184183

185184
// Wait for PVCs to terminate
186185
err = wait.Poll(RetryInterval, TerminateTimeout, func() (done bool, err error) {
187-
pvcList, err := f.KubeClient.Core().PersistentVolumeClaims(z.Namespace).List(listOptions)
186+
pvcList, err := f.KubeClient.CoreV1().PersistentVolumeClaims(z.Namespace).List(listOptions)
188187
if err != nil {
189188
return false, err
190189
}
@@ -213,7 +212,7 @@ func DeletePods(t *testing.T, f *framework.Framework, ctx *framework.TestCtx, z
213212
listOptions := metav1.ListOptions{
214213
LabelSelector: labels.SelectorFromSet(map[string]string{"app": z.GetName()}).String(),
215214
}
216-
podList, err := f.KubeClient.Core().Pods(z.Namespace).List(listOptions)
215+
podList, err := f.KubeClient.CoreV1().Pods(z.Namespace).List(listOptions)
217216
if err != nil {
218217
return err
219218
}

‎test/e2e/multiple_zk_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ func testMultiZKCluster(t *testing.T) {
5757
defaultCluster.Status.Init()
5858
defaultCluster.Spec.Persistence.VolumeReclaimPolicy = "Delete"
5959
defaultCluster.ObjectMeta.Name = "zk2"
60-
initialVersion := "0.2.5"
61-
upgradeVersion := "0.2.7"
60+
initialVersion := "0.2.7"
61+
upgradeVersion := "0.2.8-rc0"
6262
defaultCluster.Spec.Image = api.ContainerImage{
6363
Repository: "pravega/zookeeper",
6464
Tag: initialVersion,
@@ -113,6 +113,10 @@ func testMultiZKCluster(t *testing.T) {
113113
err = zk_e2eutil.WaitForClusterToBecomeReady(t, f, ctx, zk1, podSize)
114114
g.Expect(err).NotTo(HaveOccurred())
115115

116+
// This is to get the latest Zookeeper cluster object
117+
zk2, err = zk_e2eutil.GetCluster(t, f, ctx, zk2)
118+
g.Expect(err).NotTo(HaveOccurred())
119+
116120
//upgrade the image in second Cluster
117121
zk2.Spec.Image.Tag = upgradeVersion
118122

‎test/e2e/upgrade_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ func testUpgradeCluster(t *testing.T) {
3939
cluster.WithDefaults()
4040
cluster.Status.Init()
4141
cluster.Spec.Persistence.VolumeReclaimPolicy = "Delete"
42-
initialVersion := "0.2.5"
43-
upgradeVersion := "0.2.7"
42+
initialVersion := "0.2.7"
43+
upgradeVersion := "0.2.8-rc0"
4444
cluster.Spec.Image = api.ContainerImage{
4545
Repository: "pravega/zookeeper",
4646
Tag: initialVersion,

0 commit comments

Comments
 (0)