Skip to content

Commit 30e94c9

Browse files
committed
setup e2e tests as a part of PR flow
1 parent 540eeb0 commit 30e94c9

File tree

5 files changed

+7
-17
lines changed

5 files changed

+7
-17
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
CMDS=nfsplugin
16-
all: build
16+
all: build-%
1717

1818
include release-tools/build.make
1919

@@ -25,3 +25,6 @@ sanity-test: build
2525
deploy-kind:
2626
test/util/deploy-kind.sh
2727

28+
.PHONY: e2e-tests
29+
e2e-tests: deploy-kind build-tests
30+
./bin/tests --ginkgo.v --ginkgo.progress --kubeconfig=$$HOME/.kube/config

release-tools/build.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ BUILD_PLATFORMS =
7171

7272
# This builds each command (= the sub-directories of ./cmd) for the target platform(s)
7373
# defined by BUILD_PLATFORMS.
74-
$(CMDS:%=build-%): build-%: check-go-version-go
74+
build-%: check-go-version-go
7575
mkdir -p bin
7676
echo '$(BUILD_PLATFORMS)' | tr ';' '\n' | while read -r os arch suffix; do \
7777
if ! (set -x; CGO_ENABLED=0 GOOS="$$os" GOARCH="$$arch" go build $(GOFLAGS_VENDOR) -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o "./bin/$*$$suffix" ./cmd/$*); then \

release-tools/travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ before_script:
1414
- export PATH=$PWD/bin:$PATH
1515
script:
1616
- make -k all test GOFLAGS_VENDOR=$( [ -d vendor ] && echo '-mod=vendor' )
17+
- make e2e-tests
1718
after_success:
1819
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
1920
docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" quay.io;

test/e2e/suite_test.go

Lines changed: 0 additions & 4 deletions
This file was deleted.

test/util/deploy-kind.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,4 @@ echo "Seting up nfs-server-provisioner and deploying NFS CSI driver"
3232
kubectl cluster-info
3333
JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl -n kube-system get pods -lk8s-app=kube-dns -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1;echo "waiting for kube-dns to be available"; done
3434

35-
helm repo add stable https://kubernetes-charts.storage.googleapis.com/
36-
helm install nfs stable/nfs-server-provisioner --set=persistence.storageClass=standard,persistence.enabled=true,persistence.size=100Gi
37-
JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl -n default get pods -lapp=nfs-server-provisioner -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1;echo "waiting for nfs-server-provisioner deployment to be available"; done
38-
39-
kubectl apply -f deploy/kubernetes
40-
JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl -n kube-system get pods -lapp=csi-nfs-node -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1;echo "waiting for nfs node deployment to be available"; done
41-
42-
kubectl apply -f examples/kubernetes/nginx.yaml
43-
JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl -n default get pods -lapp=nginx -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1;echo "waiting for nfs node deployment to be available"; done
44-
45-
echo "CSI Driver is installed"
35+
echo "Cluster is running"

0 commit comments

Comments
 (0)