svn commit: r25297 - /dev/incubator/openwhisk/openwhisk-incubator-rc1/
Author: houshengbo Date: Tue Feb 27 07:25:38 2018 New Revision: 25297 Log: Staging Apache OpenWhisk release incubator-rc1. Modified: dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-wskdeploy-incubator-rc1-sources.tar.gz
[incubator-openwhisk-release] branch master updated: Add the script to checkout svn to the local directory (#45)
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-release.git The following commit(s) were added to refs/heads/master by this push: new 49ce24d Add the script to checkout svn to the local directory (#45) 49ce24d is described below commit 49ce24d2729c4723629340075cd3e36d9cd8ac83 Author: VincentAuthorDate: Tue Feb 27 02:22:31 2018 -0500 Add the script to checkout svn to the local directory (#45) --- tools/checkout_svn.sh | 25 + tools/package_source_code.sh| 5 - tools/travis/package_source_code.sh | 5 + tools/upload_artifacts.sh | 14 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/tools/checkout_svn.sh b/tools/checkout_svn.sh new file mode 100755 index 000..5e405d2 --- /dev/null +++ b/tools/checkout_svn.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +set -e + +echo "Checkout the SVN to the local directory." + +WORK_DIR=${1:-"$HOME"} + +SCRIPTDIR="$(cd $(dirname "$0")/ && pwd)" +source "$SCRIPTDIR/load_config.sh" $1 $2 $3 + +if [[ `wget -S --spider $CURRENT_VERSION_URL 2>&1 | grep 'HTTP/1.1 404 Not Found'` ]]; then +# Create an empty folder named ${REMOTE_PATH} in the remote staging folder +svn mkdir -m "Create the directory for ${version} in staging." $CURRENT_VERSION_URL $CREDENTIALS +fi + +# Create a subversion directory for openwhisk to stage all the packages +rm -rf $OPENWHISK_SVN +mkdir -p $OPENWHISK_SVN +rm -rf $OPENWHISK_SVN/* + +cd $OPENWHISK_SVN + +# Make sure the folder $REMOTE_PATH is connected to the svn staging server. +svn co $CURRENT_VERSION_URL $REMOTE_PATH diff --git a/tools/package_source_code.sh b/tools/package_source_code.sh index a67d05a..ae8e5fa 100755 --- a/tools/package_source_code.sh +++ b/tools/package_source_code.sh @@ -7,11 +7,6 @@ echo "Package the artifacts." SCRIPTDIR="$(cd $(dirname "$0")/ && pwd)" source "$SCRIPTDIR/load_config.sh" $1 $2 $3 -# Create a subversion directory for openwhisk to stage all the packages -rm -rf $OPENWHISK_SVN -mkdir -p $CURRENT_VERSION_DIR -rm -rf $CURRENT_VERSION_DIR/* - # Clean up all the source code by excluding unnecessary files and folders # Remove all the hidden files and folder # Remove bin and build folders diff --git a/tools/travis/package_source_code.sh b/tools/travis/package_source_code.sh index ffcdc49..20a4870 100755 --- a/tools/travis/package_source_code.sh +++ b/tools/travis/package_source_code.sh @@ -13,10 +13,7 @@ SVN_PASSWORD=$3 "$PARENTDIR/install_dependencies.sh" "$PARENTDIR/download_source_code.sh" $WORK_DIR - -if [ "$TRAVIS_EVENT_TYPE" == "push" ] ; then -"$PARENTDIR/clean_remote_stage_artifacts.sh" $SVN_USERNAME $SVN_PASSWORD -fi +"$PARENTDIR/checkout_svn.sh" $WORK_DIR $SVN_USERNAME $SVN_PASSWORD "$PARENTDIR/package_source_code.sh" $WORK_DIR $SVN_USERNAME $SVN_PASSWORD diff --git a/tools/upload_artifacts.sh b/tools/upload_artifacts.sh index 164d2fe..ffeb272 100755 --- a/tools/upload_artifacts.sh +++ b/tools/upload_artifacts.sh @@ -9,19 +9,7 @@ WORK_DIR=${1:-"$HOME"} SCRIPTDIR="$(cd $(dirname "$0")/ && pwd)" source "$SCRIPTDIR/load_config.sh" $1 $2 $3 -if [[ `wget -S --spider $CURRENT_VERSION_URL 2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then -svn delete $CURRENT_VERSION_URL -m "Removing Apache OpenWhisk release ${version} from staging." $CREDENTIALS -fi - -# Create an empty folder named ${REMOTE_PATH} in the remote staging folder -svn mkdir -m "Create the directory for ${version} in staging." $CURRENT_VERSION_URL $CREDENTIALS - -cd $OPENWHISK_SVN - -# Make sure the folder $REMOTE_PATH is connected to the svn staging server. -svn co $CURRENT_VERSION_URL $REMOTE_PATH - -cd $REMOTE_PATH +cd $OPENWHISK_SVN/$REMOTE_PATH svn add --force * $CREDENTIALS svn commit -m "Staging Apache OpenWhisk release ${version}." $CREDENTIALS -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
svn commit: r25295 - /dev/incubator/openwhisk/openwhisk-incubator-rc1/
Author: houshengbo Date: Tue Feb 27 07:09:59 2018 New Revision: 25295 Log: Create the directory for incubator-rc1 in staging. Added: dev/incubator/openwhisk/openwhisk-incubator-rc1/
svn commit: r25296 - /dev/incubator/openwhisk/openwhisk-incubator-rc1/
Author: houshengbo Date: Tue Feb 27 07:10:09 2018 New Revision: 25296 Log: Staging Apache OpenWhisk release incubator-rc1. Added: dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.sha512
svn commit: r25293 - /dev/incubator/openwhisk/openwhisk-incubator-rc1/
Author: houshengbo Date: Tue Feb 27 06:01:54 2018 New Revision: 25293 Log: Staging Apache OpenWhisk release incubator-rc1. Added: dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-apigateway-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-catalog-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-cli-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-client-go-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-docker-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-java-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-nodejs-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-php-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-python-incubator-rc1-sources.tar.gz.sha512 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz (with props) dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.asc dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.md5 dev/incubator/openwhisk/openwhisk-incubator-rc1/openwhisk-runtime-swift-incubator-rc1-sources.tar.gz.sha512
[incubator-openwhisk-cli] annotated tag latest updated (5d071c8 -> 5cb5c5f)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to annotated tag latest in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git. *** WARNING: tag latest was modified! *** from 5d071c8 (tag) to 5cb5c5f (tag) tagging 9509fc07d7465606a7f3dbe8226b72372bda9019 (commit) replaces 1.0.0 by Travis CI on Tue Feb 27 04:11:36 2018 + - Log - Generated tag from Travis CI build 832 --- from 6349a5b Fix User Agent Test add 9509fc0 Add the LICENSE file and NOTICE file No new revisions were added by this update. Summary of changes: LICENSE.txt | 202 NOTICE.md | 5 ++ 2 files changed, 207 insertions(+) create mode 100644 LICENSE.txt create mode 100644 NOTICE.md -- To stop receiving notification emails like this one, please contact csantan...@apache.org.
[incubator-openwhisk-runtime-python] branch master updated (148e578 -> 0ce7a87)
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-python.git. from 148e578 Reduce clone-and-own by reusing action proxy code add 02cec19 Add the NOTICE file new 0ce7a87 Merge pull request #8 from houshengbo/add-notice The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE.md | 5 + 1 file changed, 5 insertions(+) create mode 100644 NOTICE.md -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
[incubator-openwhisk-runtime-php] branch master updated: Add NOTICE file to this repo (#6)
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-php.git The following commit(s) were added to refs/heads/master by this push: new 7c2273a Add NOTICE file to this repo (#6) 7c2273a is described below commit 7c2273a29cdb0bb85ddf983494a2dfe5c9a1e02f Author: VincentAuthorDate: Mon Feb 26 22:40:02 2018 -0500 Add NOTICE file to this repo (#6) --- NOTICE.md | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE.md b/NOTICE.md new file mode 100644 index 000..511e1fd --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,5 @@ +Apache OpenWhisk Runtime PHP +Copyright 2016-2018 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
[incubator-openwhisk-runtime-docker] branch master updated (c8e8f31 -> a721d22)
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-docker.git. from c8e8f31 Use Maven based dependency instead of gradle project based dependency (#17) add e29def6 Add the NOTICE file new a721d22 Merge pull request #18 from houshengbo/add-notice The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE.md | 5 + 1 file changed, 5 insertions(+) create mode 100644 NOTICE.md -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
[incubator-openwhisk-runtime-docker] 01/01: Merge pull request #18 from houshengbo/add-notice
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-docker.git commit a721d22c70ca96344b817747cf3f5c144d4f1598 Merge: c8e8f31 e29def6 Author: Ying Chun GuoAuthorDate: Tue Feb 27 11:39:33 2018 +0800 Merge pull request #18 from houshengbo/add-notice Add the NOTICE file NOTICE.md | 5 + 1 file changed, 5 insertions(+) -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
[incubator-openwhisk-runtime-nodejs] branch master updated (5c7fd31 -> 29cac52)
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-nodejs.git. from 5c7fd31 Bump npm openwhisk version to pick up latest release. (#20) add 6ff92fc Add the NOTICE file new 29cac52 Merge pull request #22 from houshengbo/add-license-notice The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE.md | 5 + 1 file changed, 5 insertions(+) create mode 100644 NOTICE.md -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
[incubator-openwhisk-runtime-nodejs] 01/01: Merge pull request #22 from houshengbo/add-license-notice
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-nodejs.git commit 29cac52a3698bbfc9cf248d53b6d4c4a312ca83b Merge: 5c7fd31 6ff92fc Author: Ying Chun GuoAuthorDate: Tue Feb 27 11:39:13 2018 +0800 Merge pull request #22 from houshengbo/add-license-notice Add the NOTICE file NOTICE.md | 5 + 1 file changed, 5 insertions(+) -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
[incubator-openwhisk-runtime-java] branch master updated: Add the NOTICE file (#17)
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-java.git The following commit(s) were added to refs/heads/master by this push: new 6497206 Add the NOTICE file (#17) 6497206 is described below commit 64972064bb7cf8a5e917be339a30c78a25a939ad Author: VincentAuthorDate: Mon Feb 26 22:38:41 2018 -0500 Add the NOTICE file (#17) --- NOTICE.md | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE.md b/NOTICE.md new file mode 100644 index 000..586a653 --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,5 @@ +Apache OpenWhisk Runtime Java +Copyright 2016-2018 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
[incubator-openwhisk-client-go] branch master updated: Add the NOTICE file for further development
This is an automated email from the ASF dual-hosted git repository. daisyguo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new 92fcff9 Add the NOTICE file for further development 92fcff9 is described below commit 92fcff939b89dc9e6d616fa710f4d7f53c686d3b Author: Vincent HouAuthorDate: Fri Feb 23 16:04:15 2018 -0500 Add the NOTICE file for further development --- NOTICE.md | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE.md b/NOTICE.md new file mode 100644 index 000..2bceabb --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,5 @@ +Apache OpenWhisk Client Go +Copyright 2016-2018 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). -- To stop receiving notification emails like this one, please contact daisy...@apache.org.
[incubator-openwhisk-runtime-swift] branch master updated: Add the NOTICE file (#27)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git The following commit(s) were added to refs/heads/master by this push: new f9e9941 Add the NOTICE file (#27) f9e9941 is described below commit f9e994157233d1e6712b6f118c816d70769198b9 Author: VincentAuthorDate: Mon Feb 26 20:17:20 2018 -0500 Add the NOTICE file (#27) --- NOTICE.md | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE.md b/NOTICE.md new file mode 100644 index 000..2198613 --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,5 @@ +Apache OpenWhisk Runtime Swift +Copyright 2016-2018 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). -- To stop receiving notification emails like this one, please contact csantan...@apache.org.
[incubator-openwhisk-runtime-swift] 02/02: update readme with maven install command
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git commit eb5ddf069a6fa6f2ff5f40035e2e568f8d6aae1b Author: Carlos SantanaAuthorDate: Mon Feb 26 17:28:18 2018 -0500 update readme with maven install command --- README.md | 33 - 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 558b548..2ae5780 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ To use as a kind action wsk action update myAction myAction.swift --kind swift:3.1.1 ``` -### Local development +## Local development ``` ./gradlew core:swiftAction:distDocker ``` @@ -208,6 +208,37 @@ ln -s ${ROOTDIR}/ansible/environments/local ${OPENWHISK_HOME}/ansible/environmen wskdev fresh -t local-swift ``` +### Testing +Install dependencies from the root directory on $OPENWHISK_HOME repository +``` +./gradlew :common:scala:install :core:controller:install :core:invoker:install :tests:install +``` + +Using gradle for the ActionContainer tests you need to use a proxy if running on Mac, if Linux then don't use proxy options +You can pass the flags `-Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128` directly in gradle command. +Or save in your `$HOME/.gradle/gradle.properties` +``` +systemProp.http.proxyHost=localhost +systemProp.http.proxyPort=3128 +``` +Using gradle to run all tests +``` +./gradlew :tests:test +``` +Using gradle to run some tests +``` +./gradlew :tests:test --tests *ActionContainerTests* +``` +Using IntelliJ: +- Import project as gradle project. +- Make sure working directory is root of the project/repo +- Add the following Java VM properties in ScalaTests Run Configuration, easiest is to change the Defaults for all ScalaTests to use this VM properties +``` +-Dhttp.proxyHost=localhost +-Dhttp.proxyPort=3128 +``` + + Using container image to test To use as docker action push to your own dockerhub account ``` docker tag whisk/action-swift-v3.1.1 $user_prefix/action-swift-v3.1.1 -- To stop receiving notification emails like this one, please contact csantan...@apache.org.
[incubator-openwhisk-runtime-swift] branch master updated (b320f30 -> eb5ddf0)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git. from b320f30 Update changelogs (#25) new 22a2e27 Switch to Maven based dependency new eb5ddf0 update readme with maven install command The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 33 - settings.gradle | 12 tests/build.gradle| 7 +++ tools/travis/build.sh | 23 --- 4 files changed, 51 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact csantan...@apache.org.
[incubator-openwhisk-runtime-swift] 01/02: Switch to Maven based dependency
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-swift.git commit 22a2e272e81bfbc7c19e7c88b8f8fb94340b445f Author: Chetan MehrotraAuthorDate: Thu Feb 22 18:29:11 2018 +0530 Switch to Maven based dependency This is required for apache/incubator-openwhisk#3277 --- settings.gradle | 12 tests/build.gradle| 7 +++ tools/travis/build.sh | 23 --- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/settings.gradle b/settings.gradle index 3ebed6d..6476232 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,3 @@ -def owPath = System.getenv("OPENWHISK_HOME") ?: '../open' -def owDirectory = new File(owPath) - -include 'common:scala'; project(':common:scala').projectDir = new File(owDirectory, 'common/scala') -include 'core:controller'; project(':core:controller').projectDir = new File(owDirectory, 'core/controller') -include 'core:invoker'; project(':core:invoker').projectDir = new File(owDirectory, 'core/invoker') -include 'whisktests'; project(':whisktests').projectDir = new File(owDirectory, 'tests') - include 'tests' include 'core:swift3.1.1Action' @@ -15,6 +7,10 @@ include 'core:swift41Action' rootProject.name = 'runtime-swift' +gradle.ext.openwhisk = [ +version: '1.0.0-SNAPSHOT' +] + gradle.ext.scala = [ version: '2.11.8', compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import'] diff --git a/tests/build.gradle b/tests/build.gradle index 124229c..3b60d6c 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -2,10 +2,9 @@ apply plugin: 'scala' apply plugin: 'eclipse' compileTestScala.options.encoding = 'UTF-8' -evaluationDependsOn(':whisktests') - repositories { mavenCentral() +mavenLocal() } tasks.withType(Test) { @@ -19,8 +18,8 @@ tasks.withType(Test) { dependencies { compile "org.scala-lang:scala-library:${gradle.scala.version}" -compile project(':whisktests') -compile project(':whisktests').sourceSets.test.output +compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests" +compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources" } tasks.withType(ScalaCompile) { diff --git a/tools/travis/build.sh b/tools/travis/build.sh index f0aa297..7f87bbb 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -11,15 +11,6 @@ export OPENWHISK_HOME=$WHISKDIR IMAGE_PREFIX="testing" -# Build runtime -cd $ROOTDIR -TERM=dumb ./gradlew \ -:core:swift3.1.1Action:distDocker \ -:core:swift40Action:distDocker \ -:core:swift41Action:distDocker \ --PdockerImagePrefix=${IMAGE_PREFIX} - - # Build OpenWhisk cd $WHISKDIR @@ -31,6 +22,16 @@ docker tag openwhisk/invoker ${IMAGE_PREFIX}/invoker docker pull openwhisk/nodejs6action docker tag openwhisk/nodejs6action ${IMAGE_PREFIX}/nodejs6action +TERM=dumb ./gradlew \ +:common:scala:install \ +:core:controller:install \ +:core:invoker:install \ +:tests:install - - +# Build runtime +cd $ROOTDIR +TERM=dumb ./gradlew \ +:core:swift3.1.1Action:distDocker \ +:core:swift40Action:distDocker \ +:core:swift41Action:distDocker \ +-PdockerImagePrefix=${IMAGE_PREFIX} -- To stop receiving notification emails like this one, please contact csantan...@apache.org.
[incubator-openwhisk-package-kafka] branch master updated: More test improvements (#251)
This is an automated email from the ASF dual-hosted git repository. dubeejw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-kafka.git The following commit(s) were added to refs/heads/master by this push: new 96fd5af More test improvements (#251) 96fd5af is described below commit 96fd5af8fef2b25b281ce652ce6f7b88cdb33f46 Author: Adnan BaruniAuthorDate: Mon Feb 26 14:38:14 2018 -0600 More test improvements (#251) * add additional time for consumer init and up retry value * update produce tests to not fail immediately with multiple activations --- tests/src/test/scala/system/health/BasicHealthTest.scala | 8 +++- tests/src/test/scala/system/packages/MessageHubProduceTests.scala | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/src/test/scala/system/health/BasicHealthTest.scala b/tests/src/test/scala/system/health/BasicHealthTest.scala index 52b176d..02183d2 100644 --- a/tests/src/test/scala/system/health/BasicHealthTest.scala +++ b/tests/src/test/scala/system/health/BasicHealthTest.scala @@ -87,8 +87,14 @@ class BasicHealthTest activation => // should be successful activation.response.success shouldBe true + + // It takes a moment for the consumer to fully initialize. + println("Giving the consumer a moment to get ready") + Thread.sleep(consumerInitTime) + val uuid = activation.response.result.get.fields.get("uuid").get.toString().replaceAll("\"", "") + println("Checking health endpoint(s) for existence of consumer uuid") // get /health endpoint(s) and ensure it contains the new uuid val healthUrls = System.getProperty("health_url").split("\\s*,\\s*").filterNot(_.isEmpty) healthUrls shouldNot be(empty) @@ -111,7 +117,7 @@ class BasicHealthTest uuids should contain(uuid) - }, N = 3, waitBeforeRetry = Some(1.second)) + }, N = 10, waitBeforeRetry = Some(1.second)) } } diff --git a/tests/src/test/scala/system/packages/MessageHubProduceTests.scala b/tests/src/test/scala/system/packages/MessageHubProduceTests.scala index eb4bcd1..3c2aac8 100644 --- a/tests/src/test/scala/system/packages/MessageHubProduceTests.scala +++ b/tests/src/test/scala/system/packages/MessageHubProduceTests.scala @@ -200,7 +200,7 @@ class MessageHubProduceTests // verify trigger fired println("Polling for activations") val activations = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries) -assert(activations.length == 1) +assert(activations.length > 0) val matchingActivations = for { id <- activations @@ -269,7 +269,7 @@ class MessageHubProduceTests // verify trigger fired println("Polling for activations") val activations = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries) -assert(activations.length == 1) +assert(activations.length > 0) val matchingActivations = for { id <- activations -- To stop receiving notification emails like this one, please contact dube...@apache.org.
[incubator-openwhisk-devtools] branch master updated: Added maven archetype for Java Action (#97)
This is an automated email from the ASF dual-hosted git repository. dragos pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git The following commit(s) were added to refs/heads/master by this push: new 7c2b754 Added maven archetype for Java Action (#97) 7c2b754 is described below commit 7c2b75492884d00c5387712b09442fdca7c043a3 Author: Kamesh SampathAuthorDate: Tue Feb 27 01:40:35 2018 +0530 Added maven archetype for Java Action (#97) * Adding Maven Archetype to generate template projects for JavaActions * Adding archetype tests * enabled travis * Adding maven wrapper * Fixed final name of generated project to match artifactId * README update for deploying app --- .gitignore | 1 + .travis.yml| 1 + java-action-archetype/.editorconfig| 25 java-action-archetype/.gitignore | 1 + java-action-archetype/.travis/build.sh | 10 + java-action-archetype/.travis/setup.sh | 10 + java-action-archetype/README.md| 39 ++ java-action-archetype/pom.xml | 28 + .../main/resources/META-INF/maven/archetype.xml| 9 + .../src/main/resources/archetype-resources/pom.xml | 47 ++ .../src/main/java/FunctionApp.java | 31 ++ .../src/test/java/FunctionAppTest.java | 39 ++ .../resources/projects/basic/archetype.properties | 4 ++ .../src/test/resources/projects/basic/goal.txt | 1 + 14 files changed, 246 insertions(+) diff --git a/.gitignore b/.gitignore index 9e9a503..24ad037 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ openwhisk-master* *.iml .idea .vscode +**/.sts4-cache diff --git a/.travis.yml b/.travis.yml index 1d678b6..c3eaff3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - DOCKER_COMPOSE_VERSION: 1.13.0 matrix: - TOOL: docker-compose +- TOOL: java-action-archetype services: - docker diff --git a/java-action-archetype/.editorconfig b/java-action-archetype/.editorconfig new file mode 100644 index 000..3e5b662 --- /dev/null +++ b/java-action-archetype/.editorconfig @@ -0,0 +1,25 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = false + +# Matches multiple files with brace expansion notation +# Set default charset +[*.{java}] +charset = utf-8 + +# 4 space indentation +[*.java] +indent_style = space +indent_size = 2 +insert_final_newline = true + +# Indentation style for yaml, yml +[*.{js,xml,html,json,yaml,yml}] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/java-action-archetype/.gitignore b/java-action-archetype/.gitignore new file mode 100644 index 000..1de5659 --- /dev/null +++ b/java-action-archetype/.gitignore @@ -0,0 +1 @@ +target \ No newline at end of file diff --git a/java-action-archetype/.travis/build.sh b/java-action-archetype/.travis/build.sh new file mode 100755 index 000..d29d3fc --- /dev/null +++ b/java-action-archetype/.travis/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +SCRIPTDIR=$(cd $(dirname "$0") && pwd) +TOOLDIR="$SCRIPTDIR/../" + +cd $TOOLDIR + +mvn -V test + +#TODO steps that can push this artifact to nexus diff --git a/java-action-archetype/.travis/setup.sh b/java-action-archetype/.travis/setup.sh new file mode 100755 index 000..f2c7951 --- /dev/null +++ b/java-action-archetype/.travis/setup.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -x -e +uname -sm + +SCRIPTDIR=$(cd $(dirname "$0") && pwd) +TOOLDIR="$SCRIPTDIR/../" + +cd $TOOLDIR + +mvn -DskipTests=true -Dmaven.javadoc.skip=true -B -V clean install diff --git a/java-action-archetype/README.md b/java-action-archetype/README.md new file mode 100644 index 000..67bf3da --- /dev/null +++ b/java-action-archetype/README.md @@ -0,0 +1,39 @@ +# Maven Archetype for Java Action + +This archetype helps to generate the Java Action template project. + +## Pre-requisite + +The following softwares are required to build and deploy a Java Action to OpenWhisk: + +* (Maven v3.3.x)[https://maven.apache.org] or above +* Java 8 or above + +[WSK CLI](https://github.com/apache/incubator-openwhisk/blob/master/docs/cli.md) is configured + +## Generate project + +```sh +mvn archetype:generate \ + -DarchetypeGroupId=org.apache.openwhisk.java \ + -DarchetypeArtifactId=java-action-archetype \ + -DarchetypeVersion=1.0-SNAPSHOT \ + -DgroupId=com.example \ + -DartifactId=demo-function +``` + +## Deploying function to OpenWhisk + +The following step shows how to deploy the function to OpenWhisk + +```sh +cd demo-function +mvn clean install +wsk action create demo
[incubator-openwhisk-wskdeploy] branch master updated: Add the NOTICE for further development (#753)
This is an automated email from the ASF dual-hosted git repository. pdesai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git The following commit(s) were added to refs/heads/master by this push: new 2c03e05 Add the NOTICE for further development (#753) 2c03e05 is described below commit 2c03e0587d87ffcfed8a1c2fa663934da2757d16 Author: VincentAuthorDate: Mon Feb 26 14:57:21 2018 -0500 Add the NOTICE for further development (#753) --- NOTICE.md | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE.md b/NOTICE.md new file mode 100644 index 000..3b2d668 --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,5 @@ +Apache OpenWhisk Wskdeploy +Copyright 2016-2018 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). -- To stop receiving notification emails like this one, please contact pde...@apache.org.
[incubator-openwhisk] branch master updated: Add the NOTICE file for future development (#3339)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git The following commit(s) were added to refs/heads/master by this push: new 4d4477b Add the NOTICE file for future development (#3339) 4d4477b is described below commit 4d4477bf1082d4fddcb29a1ad7a41727a814417e Author: VincentAuthorDate: Mon Feb 26 14:35:45 2018 -0500 Add the NOTICE file for future development (#3339) --- NOTICE.md | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE.md b/NOTICE.md new file mode 100644 index 000..e6d7bdb --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,5 @@ +Apache OpenWhisk +Copyright 2016-2018 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). -- To stop receiving notification emails like this one, please contact csantan...@apache.org.
[incubator-openwhisk-catalog] branch curl-tests deleted (was 13695ba)
This is an automated email from the ASF dual-hosted git repository. dubeejw pushed a change to branch curl-tests in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-catalog.git. was 13695ba Update CURL Tests The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact dube...@apache.org.
[incubator-openwhisk] branch master updated: Put active-ack consumers in their own consumer-groups. (#3337)
This is an automated email from the ASF dual-hosted git repository. cbickel pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git The following commit(s) were added to refs/heads/master by this push: new c184cc6 Put active-ack consumers in their own consumer-groups. (#3337) c184cc6 is described below commit c184cc6fdabbe857bfc1bd33aa7acda07179d1e5 Author: Markus ThömmesAuthorDate: Mon Feb 26 17:26:12 2018 +0100 Put active-ack consumers in their own consumer-groups. (#3337) Just like with the invoker consumers, it doesn't make sense to have those in one group as crash of one will cause a rebalancing pause for the other. --- .../scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala | 8 +++- .../whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala | 7 ++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/core/controller/src/main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala b/core/controller/src/main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala index dfa57bb..de2e56e 100644 --- a/core/controller/src/main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala +++ b/core/controller/src/main/scala/whisk/core/loadBalancer/ContainerPoolBalancer.scala @@ -205,14 +205,12 @@ class ContainerPoolBalancer(config: WhiskConfig, controllerInstance: InstanceId) * Subscribes to active acks (completion messages from the invokers), and * registers a handler for received active acks from invokers. */ + val activeAckTopic = s"completed${controllerInstance.toInt}" val maxActiveAcksPerPoll = 128 val activeAckPollDuration = 1.second private val activeAckConsumer = -messagingProvider.getConsumer( - config, - "completions", - s"completed${controllerInstance.toInt}", - maxPeek = maxActiveAcksPerPoll) +messagingProvider.getConsumer(config, activeAckTopic, activeAckTopic, maxPeek = maxActiveAcksPerPoll) + val activationFeed = actorSystem.actorOf(Props { new MessageFeed( "activeack", diff --git a/core/controller/src/main/scala/whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala b/core/controller/src/main/scala/whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala index 607670d..9b7aaec 100644 --- a/core/controller/src/main/scala/whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala +++ b/core/controller/src/main/scala/whisk/core/loadBalancer/ShardingContainerPoolBalancer.scala @@ -205,14 +205,11 @@ class ShardingContainerPoolBalancer(config: WhiskConfig, controllerInstance: Ins * Subscribes to active acks (completion messages from the invokers), and * registers a handler for received active acks from invokers. */ + private val activeAckTopic = s"completed${controllerInstance.toInt}" private val maxActiveAcksPerPoll = 128 private val activeAckPollDuration = 1.second private val activeAckConsumer = -messagingProvider.getConsumer( - config, - "completions", - s"completed${controllerInstance.toInt}", - maxPeek = maxActiveAcksPerPoll) +messagingProvider.getConsumer(config, activeAckTopic, activeAckTopic, maxPeek = maxActiveAcksPerPoll) private val activationFeed = actorSystem.actorOf(Props { new MessageFeed( -- To stop receiving notification emails like this one, please contact cbic...@apache.org.
[incubator-openwhisk] branch master updated: Enhance Kafka message provider for resiliency. (#3072)
This is an automated email from the ASF dual-hosted git repository. markusthoemmes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git The following commit(s) were added to refs/heads/master by this push: new a91feb0 Enhance Kafka message provider for resiliency. (#3072) a91feb0 is described below commit a91feb013dde79eca2e892f70840157f9b18ccb4 Author: Sang Heon LeeAuthorDate: Mon Feb 26 18:55:19 2018 +0900 Enhance Kafka message provider for resiliency. (#3072) Co-authored-by: Markus Thömmes --- common/scala/src/main/resources/application.conf | 2 + .../connector/kafka/KafkaConsumerConnector.scala | 90 +- .../connector/kafka/KafkaMessagingProvider.scala | 12 ++- .../connector/kafka/KafkaProducerConnector.scala | 79 +++ .../whisk/core/connector/MessageConsumer.scala | 4 +- .../whisk/core/connector/MessagingProvider.scala | 16 ++-- .../core/database/RemoteCacheInvalidation.scala| 5 +- .../core/loadBalancer/ContainerPoolBalancer.scala | 2 +- .../ShardingContainerPoolBalancer.scala| 2 +- .../main/scala/whisk/core/invoker/Invoker.scala| 2 +- tests/src/test/scala/ha/ShootComponentsTests.scala | 70 + .../test/scala/services/KafkaConnectorTests.scala | 44 --- .../core/connector/test/MessageFeedTests.scala | 2 +- .../whisk/core/connector/test/TestConnector.scala | 6 +- 14 files changed, 219 insertions(+), 117 deletions(-) diff --git a/common/scala/src/main/resources/application.conf b/common/scala/src/main/resources/application.conf index 3e09bba..1b9b739 100644 --- a/common/scala/src/main/resources/application.conf +++ b/common/scala/src/main/resources/application.conf @@ -60,6 +60,8 @@ whisk { producer { acks = 1 max-request-size = ${whisk.activation.payload.max} +request-timeout-ms = 3 +metadata-max-age-ms = 15000 } consumer { session-timeout-ms = 3 diff --git a/common/scala/src/main/scala/whisk/connector/kafka/KafkaConsumerConnector.scala b/common/scala/src/main/scala/whisk/connector/kafka/KafkaConsumerConnector.scala index 09cd3ac..51a27ad 100644 --- a/common/scala/src/main/scala/whisk/connector/kafka/KafkaConsumerConnector.scala +++ b/common/scala/src/main/scala/whisk/connector/kafka/KafkaConsumerConnector.scala @@ -19,43 +19,86 @@ package whisk.connector.kafka import java.util.Properties -import scala.collection.JavaConversions.iterableAsScalaIterable -import scala.collection.JavaConversions.seqAsJavaList -import scala.concurrent.duration.Duration -import scala.concurrent.duration.DurationInt -import org.apache.kafka.clients.consumer.ConsumerConfig -import org.apache.kafka.clients.consumer.KafkaConsumer +import akka.actor.ActorSystem +import org.apache.kafka.clients.consumer.{ConsumerConfig, KafkaConsumer} +import org.apache.kafka.common.errors.{RetriableException, WakeupException} import org.apache.kafka.common.serialization.ByteArrayDeserializer import pureconfig.loadConfigOrThrow import whisk.common.Logging import whisk.core.ConfigKeys import whisk.core.connector.MessageConsumer -class KafkaConsumerConnector(kafkahost: String, - groupid: String, - topic: String, - override val maxPeek: Int = Int.MaxValue)(implicit logging: Logging) +import scala.collection.JavaConversions.{iterableAsScalaIterable, seqAsJavaList} +import scala.concurrent.duration._ +import scala.concurrent.{ExecutionContext, Future} + +case class KafkaConsumerConfig(sessionTimeoutMs: Long) + +class KafkaConsumerConnector( + kafkahost: String, + groupid: String, + topic: String, + override val maxPeek: Int = Int.MaxValue)(implicit logging: Logging, actorSystem: ActorSystem) extends MessageConsumer { + implicit val ec: ExecutionContext = actorSystem.dispatcher + private val gracefulWaitTime = 100.milliseconds + + // The consumer is generally configured via getProps. This configuration only loads values necessary for "outer" + // logic, like the wakeup timer. + private val cfg = loadConfigOrThrow[KafkaConsumerConfig](ConfigKeys.kafkaConsumer) + /** * Long poll for messages. Method returns once message are available but no later than given * duration. * * @param duration the maximum duration for the long poll */ - override def peek(duration: Duration = 500.milliseconds) = { -val records = consumer.poll(duration.toMillis) -records map { r => - (r.topic, r.partition, r.offset, r.value) -} + override def peek(duration: FiniteDuration = 500.milliseconds, +retry: Int = 3): Iterable[(String, Int, Long, Array[Byte])] = { + +// poll can be infinitely blocked in edge-cases, so we need to wakeup explicitly. +val