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/12/18 12:51:44 UTC
[openwhisk] branch master updated (a6e27bd -> 4f8ba43)
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git.
from a6e27bd rename tools/vagrant/hello to hello.sh (#4774)
new 104e89e Update invoke.py for python 3.
new 6f1cf37 Remove another unused test artifact.
new 4f8ba43 If OPENWHISK_HOME is defined, use it as the path to gradlew otherwise use relative path.
The 3 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:
tests/dat/actions/build.sh | 1 -
tests/dat/actions/python_virtualenv/__main__.py | 32 ----------------------
tests/dat/actions/python_virtualenv/build.sh | 21 --------------
.../dat/actions/python_virtualenv/requirements.txt | 18 ------------
tests/performance/gatling_tests/build.sh | 4 ++-
tools/actionProxy/invoke.py | 2 +-
6 files changed, 4 insertions(+), 74 deletions(-)
delete mode 100755 tests/dat/actions/python_virtualenv/__main__.py
delete mode 100755 tests/dat/actions/python_virtualenv/build.sh
delete mode 100644 tests/dat/actions/python_virtualenv/requirements.txt
[openwhisk] 02/03: Remove another unused test artifact.
Posted by dg...@apache.org.
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/openwhisk.git
commit 6f1cf377bd0655dc36dea1a066e2a13f90493777
Author: Rodric Rabbah <ro...@gmail.com>
AuthorDate: Tue Dec 17 22:45:57 2019 -0500
Remove another unused test artifact.
---
tests/dat/actions/build.sh | 1 -
tests/dat/actions/python_virtualenv/__main__.py | 32 ----------------------
tests/dat/actions/python_virtualenv/build.sh | 21 --------------
.../dat/actions/python_virtualenv/requirements.txt | 18 ------------
4 files changed, 72 deletions(-)
diff --git a/tests/dat/actions/build.sh b/tests/dat/actions/build.sh
index b42dc33..a80df5f 100755
--- a/tests/dat/actions/build.sh
+++ b/tests/dat/actions/build.sh
@@ -37,6 +37,5 @@ fi
(cd blackbox && zip ../blackbox.zip exec)
(cd python-zip && zip ../python.zip -r .)
(cd zippedaction && npm install && zip ../zippedaction.zip -r .)
-(cd python_virtualenv && ./build.sh && zip ../python2_virtualenv.zip -r .)
touch .built
diff --git a/tests/dat/actions/python_virtualenv/__main__.py b/tests/dat/actions/python_virtualenv/__main__.py
deleted file mode 100755
index e075550..0000000
--- a/tests/dat/actions/python_virtualenv/__main__.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-"""Python Hello virtualenv test.
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-"""
-
-import netifaces
-
-def main(dict):
- networkif = netifaces.interfaces()
- print ("Networkinterfaces: \n %s" %networkif )
- networkinfo = netifaces.ifaddresses('eth0')[netifaces.AF_INET]
- print ("Networkinfo eth0: \n %s" %networkinfo )
- return {"Networkinfo: ": networkinfo}
-
-def naim(dict):
- return main(dict)
diff --git a/tests/dat/actions/python_virtualenv/build.sh b/tests/dat/actions/python_virtualenv/build.sh
deleted file mode 100755
index 6e4b8fe..0000000
--- a/tests/dat/actions/python_virtualenv/build.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-virtualenv virtualenv
-source virtualenv/bin/activate
-pip install -r requirements.txt
diff --git a/tests/dat/actions/python_virtualenv/requirements.txt b/tests/dat/actions/python_virtualenv/requirements.txt
deleted file mode 100644
index 65e1d5f..0000000
--- a/tests/dat/actions/python_virtualenv/requirements.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-netifaces==0.10.9
[openwhisk] 03/03: If OPENWHISK_HOME is defined,
use it as the path to gradlew otherwise use relative path.
Posted by dg...@apache.org.
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/openwhisk.git
commit 4f8ba43da70ae08af5c4b7f0720396d62d1a9514
Author: Rodric Rabbah <ro...@gmail.com>
AuthorDate: Tue Dec 17 22:48:17 2019 -0500
If OPENWHISK_HOME is defined, use it as the path to gradlew otherwise use relative path.
---
tests/performance/gatling_tests/build.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/performance/gatling_tests/build.sh b/tests/performance/gatling_tests/build.sh
index 547abd6..02cd3fa 100755
--- a/tests/performance/gatling_tests/build.sh
+++ b/tests/performance/gatling_tests/build.sh
@@ -18,6 +18,8 @@
set -e
+GRADLEW_PATH=${OPENWHISK_HOME:-../../../../../../../../..}
+
if [ -f ".built" ]; then
echo "Test zip artifacts already built, skipping"
exit 0
@@ -27,7 +29,7 @@ fi
jv=$(java -version 2>&1 | head -1 | awk -F'"' '{print $2}')
if [[ $jv == 1.8.* ]]; then
echo "java version is $jv (ok)"
- (cd src/gatling/resources/data/src/java && ../../../../../../../../../gradlew build && cp build/libs/gatling-1.0.jar ../../javaAction.jar)
+ (cd src/gatling/resources/data/src/java && "$GRADLEW_PATH/gradlew" build && cp build/libs/gatling-1.0.jar ../../javaAction.jar)
touch .built
else
echo "java version is $jv (not ok)"
[openwhisk] 01/03: Update invoke.py for python 3.
Posted by dg...@apache.org.
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/openwhisk.git
commit 104e89ebca7b67302289c3ff5ef3334e73e7f25b
Author: Rodric Rabbah <ro...@gmail.com>
AuthorDate: Tue Dec 17 22:37:47 2019 -0500
Update invoke.py for python 3.
---
tools/actionProxy/invoke.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/actionProxy/invoke.py b/tools/actionProxy/invoke.py
index 6e7000e..1fe1c0e 100755
--- a/tools/actionProxy/invoke.py
+++ b/tools/actionProxy/invoke.py
@@ -99,7 +99,7 @@ def init(args):
if artifact and (args.binary or artifact.endswith('.zip') or artifact.endswith('tgz') or artifact.endswith('jar')):
with open(artifact, 'rb') as fp:
contents = fp.read()
- contents = base64.b64encode(contents)
+ contents = str(base64.b64encode(contents), 'utf-8')
binary = True
elif artifact is not '':
with(codecs.open(artifact, 'r', 'utf-8')) as fp: