[GitHub] csantanapr closed pull request #309: fixes for TravisCI runs

[GitBox <gi...@apache.org>]

csantanapr closed pull request #309: fixes for TravisCI runs
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/309
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/helm/openwhisk-providers/charts/ow-alarm/configMapFiles/myTask.sh b/helm/openwhisk-providers/charts/ow-alarm/configMapFiles/myTask.sh
index 27f46f1..62c64d9 100644
--- a/helm/openwhisk-providers/charts/ow-alarm/configMapFiles/myTask.sh
+++ b/helm/openwhisk-providers/charts/ow-alarm/configMapFiles/myTask.sh
@@ -6,9 +6,6 @@
 
 export OPENWHISK_HOME=/usr/local
 
-# install npm
-apk add --update nodejs-npm
-
 git clone https://github.com/apache/incubator-openwhisk-package-alarms.git
 
 export DB_URL=$DB_PROTOCOL://$DB_USERNAME:$DB_PASSWORD@$DB_HOST:$DB_PORT
diff --git a/tools/travis/build-helm.sh b/tools/travis/build-helm.sh
index 79cb2af..1d7c7d4 100755
--- a/tools/travis/build-helm.sh
+++ b/tools/travis/build-helm.sh
@@ -188,7 +188,7 @@ EOF
 echo "Contents of mycluster.yaml are:"
 cat mycluster.yaml
 
-helm install helm/openwhisk --namespace=openwhisk --name=ow4travis -f mycluster.yaml
+helm install helm/openwhisk --namespace=openwhisk --name=ow4travis -f mycluster.yaml || exit 1
 
 # Wait for controller to be up
 statefulsetHealthCheck "controller"
@@ -264,7 +264,7 @@ echo "PASSED! Deployed openwhisk and invoked Hello action"
 ####
 # now test the installation of kafka provider
 ####
-helm install helm/openwhisk-providers/charts/ow-kafka --namespace=openwhisk --name=kafkap4travis
+helm install helm/openwhisk-providers/charts/ow-kafka --namespace=openwhisk --name=kafkap4travis  || exit 1
 
 jobHealthCheck "install-package-kafka"
 
@@ -282,7 +282,7 @@ echo "PASSED! Deployed Kafka provider and package"
 ####
 # now test the installation of Alarm provider
 ####
-helm install helm/openwhisk-providers/charts/ow-alarm --namespace=openwhisk --name alarmp4travis --set alarmprovider.persistence.storageClass=standard
+helm install helm/openwhisk-providers/charts/ow-alarm --namespace=openwhisk --name alarmp4travis --set alarmprovider.persistence.storageClass=standard  || exit 1
 
 jobHealthCheck "install-package-alarm"
 
@@ -300,7 +300,7 @@ echo "PASSED! Deployed Alarms provider and package"
 ####
 # now test the installation of Cloudant provider
 ####
-helm install helm/openwhisk-providers/charts/ow-cloudant --namespace=openwhisk --name cloudantp4travis --set cloudantprovider.persistence.storageClass=standard
+helm install helm/openwhisk-providers/charts/ow-cloudant --namespace=openwhisk --name cloudantp4travis --set cloudantprovider.persistence.storageClass=standard  || exit 1
 
 jobHealthCheck "install-package-cloudant"
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services