You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2019/05/17 14:19:30 UTC

[incubator-openwhisk-deploy-kube] branch master updated: Update openwhisk version (#464)

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 6a2e743  Update openwhisk version (#464)
6a2e743 is described below

commit 6a2e743ad17ef8748134273d1379f05596850094
Author: Pavel Kravchenko <kp...@il.ibm.com>
AuthorDate: Fri May 17 17:19:24 2019 +0300

    Update openwhisk version (#464)
    
    Update version of openwhisk docker images & increase timeout for system tests to 40 minutes.
---
 .travis.yml                                             | 2 +-
 helm/openwhisk/templates/ow-docker-registry-secret.yaml | 4 ++--
 helm/openwhisk/values.yaml                              | 8 ++++----
 tools/travis/run-tests.sh                               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 080590d..bbd0ce1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_install:
 
 script:
   - ./tools/travis/deploy-chart.sh
-  - travis_wait 25 ./tools/travis/run-tests.sh
+  - travis_wait 42 ./tools/travis/run-tests.sh
   - ./tools/travis/collect-logs.sh
   - ./tools/travis/box-upload.py "logs" "deploy-kube-$TRAVIS_BUILD_ID-$TRAVIS_BRANCH-$TRAVIS_JOB_NUMBER.tar.gz"
 
diff --git a/helm/openwhisk/templates/ow-docker-registry-secret.yaml b/helm/openwhisk/templates/ow-docker-registry-secret.yaml
index e5453fb..c3fa2c8 100644
--- a/helm/openwhisk/templates/ow-docker-registry-secret.yaml
+++ b/helm/openwhisk/templates/ow-docker-registry-secret.yaml
@@ -9,5 +9,5 @@ metadata:
 {{ include "openwhisk.label_boilerplate" . | indent 4 }}
 type: Opaque
 data:
-  docker_registry_username: {{ .Values.docker.registry.username | b64enc }}
-  docker_registry_password: {{ .Values.docker.registry.password | b64enc }}
+  docker_registry_username: {{ .Values.docker.registry.username | quote | b64enc }}
+  docker_registry_password: {{ .Values.docker.registry.password | quote | b64enc }}
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 752dfe8..e41db73 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -113,7 +113,7 @@ whisk:
     openwhisk:
       buildDate: "2019-04-05-18:03:02Z"
       buildNo: "20190405a"
-      gitTag: "95afbb32aef61f8d278ee142d1cea7cead96a0ff"
+      gitTag: "d353d26cb44ae8c99988465123b6c8e5567b3fc1"
     openwhiskCli:
       tag: "eaf64ae"
     openwhiskCatalog:
@@ -136,7 +136,7 @@ k8s:
 # Images used to run auxillary tasks/jobs
 utility:
   imageName: "openwhisk/ow-utils"
-  imageTag: "95afbb3"
+  imageTag: "d353d26"
   imagePullPolicy: "IfNotPresent"
 
 # Docker registry
@@ -220,7 +220,7 @@ nginx:
 # Controller configurations
 controller:
   imageName: "openwhisk/controller"
-  imageTag: "95afbb3"
+  imageTag: "d353d26"
   imagePullPolicy: "IfNotPresent"
   replicaCount: 1
   restartPolicy: "Always"
@@ -232,7 +232,7 @@ controller:
 # Invoker configurations
 invoker:
   imageName: "openwhisk/invoker"
-  imageTag: "95afbb3"
+  imageTag: "d353d26"
   imagePullPolicy: "IfNotPresent"
   restartPolicy: "Always"
   port: 8080
diff --git a/tools/travis/run-tests.sh b/tools/travis/run-tests.sh
index 8aa1fba..aa17d89 100755
--- a/tools/travis/run-tests.sh
+++ b/tools/travis/run-tests.sh
@@ -5,7 +5,7 @@
 ###
 # Now run the tests provided in the Chart to verify the deployment
 ###
-if helm test ow4travis --timeout 1200; then
+if helm test ow4travis --timeout 2400; then
     echo "PASSED! Deployment verification tests passed."
 else
     echo "FAILED: Deployment verification tests failed."