This repository was archived by the owner on Oct 21, 2020. It is now read-only.
File tree 3 files changed +18
-10
lines changed
3 files changed +18
-10
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ all: aws/efs ceph/cephfs ceph/rbd flex gluster/block gluster/glusterfs gluster/f
18
18
clean : clean-aws/efs clean-ceph/cephfs clean-ceph/rbd clean-flex clean-gluster/block clean-gluster/glusterfs clean-iscsi/targetd clean-local-volume/provisioner clean-nfs-client clean-nfs clean-openebs clean-snapshot
19
19
.PHONY : clean
20
20
21
- test : test-aws/efs test-local-volume/provisioner test-local-volume/helm test- nfs test-snapshot
21
+ test : test-aws/efs test-local-volume/provisioner test-nfs test-snapshot
22
22
.PHONY : test
23
23
24
24
verify :
Original file line number Diff line number Diff line change @@ -21,16 +21,9 @@ set -o pipefail
21
21
ROOT=$( unset CDPATH && cd $( dirname " ${BASH_SOURCE[0]} " ) /.. && pwd)
22
22
cd $ROOT
23
23
24
- function install_helm() {
25
- local OS=$( uname | tr A-Z a-z)
26
- local VERSION=v2.7.2
27
- local ARCH=amd64
28
- local HELM_URL=http://storage.googleapis.com/kubernetes-helm/helm-${VERSION} -${OS} -${ARCH} .tar.gz
29
- curl -s " $HELM_URL " | sudo tar --strip-components 1 -C /usr/local/bin -zxf - ${OS} -${ARCH} /helm
30
- }
31
-
32
24
if ! which helm & > /dev/null; then
33
- install_helm
25
+ echo " helm not installed, see README.md for instructions on installing it"
26
+ exit 2
34
27
fi
35
28
36
29
# lint first
Original file line number Diff line number Diff line change @@ -19,6 +19,18 @@ set -o nounset
19
19
set -o pipefail
20
20
set -o xtrace
21
21
22
+ # This file is used by travisci to test PRs.
23
+ # It installs several dependencies on the test machine that are
24
+ # required to run the tests.
25
+
26
+ function install_helm() {
27
+ local OS=$( uname | tr A-Z a-z)
28
+ local VERSION=v2.7.2
29
+ local ARCH=amd64
30
+ local HELM_URL=http://storage.googleapis.com/kubernetes-helm/helm-${VERSION} -${OS} -${ARCH} .tar.gz
31
+ curl -s " $HELM_URL " | sudo tar --strip-components 1 -C /usr/local/bin -zxf - ${OS} -${ARCH} /helm
32
+ }
33
+
22
34
# Skip duplicate build and test runs through the CI, that occur because we are now running on osx and linux.
23
35
# Skipping these steps saves time and travis-ci resources.
24
36
if [ " $TRAVIS_OS_NAME " = " osx" ]; then
@@ -49,6 +61,8 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
49
61
export PATH=$( pwd) :${PATH}
50
62
make
51
63
make test
64
+ install_helm
65
+ make test-local-volume/helm
52
66
fi
53
67
elif [ " $TEST_SUITE " = " linux-nfs" ]; then
54
68
# Install nfs, cfssl
@@ -120,5 +134,6 @@ elif [ "$TEST_SUITE" = "linux-everything-else" ]; then
120
134
elif [ " $TEST_SUITE " = " linux-local-volume" ]; then
121
135
make local-volume/provisioner
122
136
make test-local-volume/provisioner
137
+ install_helm
123
138
make test-local-volume/helm
124
139
fi
You can’t perform that action at this time.
0 commit comments