You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2018/05/24 16:07:37 UTC
[incubator-openwhisk] branch master updated: Move the files under
performance to tests/performance (#3696)
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 cd2d9e2 Move the files under performance to tests/performance (#3696)
cd2d9e2 is described below
commit cd2d9e2292c65a7d0bd6e303e7f37254b913a8e5
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Thu May 24 12:07:31 2018 -0400
Move the files under performance to tests/performance (#3696)
---
.travis.yml | 6 +++---
settings.gradle | 2 +-
{performance => tests/performance}/README.md | 0
.../performance}/gatling_tests/build.gradle | 0
.../gatling_tests/src/gatling/resources/conf/logback.xml | 0
.../gatling_tests/src/gatling/resources/data/javaAction.jar | Bin
.../src/gatling/resources/data/javaAction.java | 0
.../src/gatling/resources/data/nodeJSAction.js | 0
.../src/gatling/resources/data/pythonAction.py | 0
.../src/gatling/resources/data/swiftAction.swift | 0
.../gatling_tests/src/gatling/scala/ApiV1Simulation.scala | 0
.../gatling/scala/BlockingInvokeOneActionSimulation.scala | 0
.../gatling_tests/src/gatling/scala/LatencySimulation.scala | 0
.../scala/extension/whisk/OpenWhiskActionBuilder.scala | 0
.../src/gatling/scala/extension/whisk/OpenWhiskDsl.scala | 0
.../scala/extension/whisk/OpenWhiskProtocolBuilder.scala | 0
.../src/gatling/scala/extension/whisk/Predef.scala | 0
{performance => tests/performance}/preparation/create.sh | 0
{performance => tests/performance}/preparation/deploy.sh | 2 +-
{performance => tests/performance}/wrk_tests/latency.sh | 0
{performance => tests/performance}/wrk_tests/post.lua | 0
{performance => tests/performance}/wrk_tests/throughput.sh | 0
22 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e37432e..ab7a0f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,9 +63,9 @@ jobs:
- ./tools/travis/checkAndUploadLogs.sh system
env: DESCRIPTION="System Tests"
- script:
- - ./performance/preparation/deploy.sh
- - TERM=dumb ./performance/wrk_tests/latency.sh "https://172.17.0.1:10001" "$(cat ansible/files/auth.guest)" 2m
- - TERM=dumb ./performance/wrk_tests/throughput.sh "https://172.17.0.1:10001" "$(cat ansible/files/auth.guest)" 4 2 2m
+ - ./tests/performance/preparation/deploy.sh
+ - TERM=dumb ./tests/performance/wrk_tests/latency.sh "https://172.17.0.1:10001" "$(cat ansible/files/auth.guest)" 2m
+ - TERM=dumb ./tests/performance/wrk_tests/throughput.sh "https://172.17.0.1:10001" "$(cat ansible/files/auth.guest)" 4 2 2m
- OPENWHISK_HOST="172.17.0.1" CONNECTIONS="100" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-ApiV1Simulation
- OPENWHISK_HOST="172.17.0.1" MEAN_RESPONSE_TIME="1000" API_KEY="$(cat ansible/files/auth.guest)" EXCLUDED_KINDS="python:default,java:default,swift:default" ./gradlew gatlingRun-LatencySimulation
- OPENWHISK_HOST="172.17.0.1" API_KEY="$(cat ansible/files/auth.guest)" CONNECTIONS="100" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-BlockingInvokeOneActionSimulation
diff --git a/settings.gradle b/settings.gradle
index 084899c..ecb59f2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -34,7 +34,7 @@ include 'sdk:docker'
include 'tests'
include 'tests:dat:blackbox:badaction'
include 'tests:dat:blackbox:badproxy'
-include 'performance:gatling_tests'
+include 'tests:performance:gatling_tests'
rootProject.name = 'openwhisk'
diff --git a/performance/README.md b/tests/performance/README.md
similarity index 100%
rename from performance/README.md
rename to tests/performance/README.md
diff --git a/performance/gatling_tests/build.gradle b/tests/performance/gatling_tests/build.gradle
similarity index 100%
rename from performance/gatling_tests/build.gradle
rename to tests/performance/gatling_tests/build.gradle
diff --git a/performance/gatling_tests/src/gatling/resources/conf/logback.xml b/tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml
similarity index 100%
rename from performance/gatling_tests/src/gatling/resources/conf/logback.xml
rename to tests/performance/gatling_tests/src/gatling/resources/conf/logback.xml
diff --git a/performance/gatling_tests/src/gatling/resources/data/javaAction.jar b/tests/performance/gatling_tests/src/gatling/resources/data/javaAction.jar
similarity index 100%
rename from performance/gatling_tests/src/gatling/resources/data/javaAction.jar
rename to tests/performance/gatling_tests/src/gatling/resources/data/javaAction.jar
diff --git a/performance/gatling_tests/src/gatling/resources/data/javaAction.java b/tests/performance/gatling_tests/src/gatling/resources/data/javaAction.java
similarity index 100%
rename from performance/gatling_tests/src/gatling/resources/data/javaAction.java
rename to tests/performance/gatling_tests/src/gatling/resources/data/javaAction.java
diff --git a/performance/gatling_tests/src/gatling/resources/data/nodeJSAction.js b/tests/performance/gatling_tests/src/gatling/resources/data/nodeJSAction.js
similarity index 100%
rename from performance/gatling_tests/src/gatling/resources/data/nodeJSAction.js
rename to tests/performance/gatling_tests/src/gatling/resources/data/nodeJSAction.js
diff --git a/performance/gatling_tests/src/gatling/resources/data/pythonAction.py b/tests/performance/gatling_tests/src/gatling/resources/data/pythonAction.py
similarity index 100%
rename from performance/gatling_tests/src/gatling/resources/data/pythonAction.py
rename to tests/performance/gatling_tests/src/gatling/resources/data/pythonAction.py
diff --git a/performance/gatling_tests/src/gatling/resources/data/swiftAction.swift b/tests/performance/gatling_tests/src/gatling/resources/data/swiftAction.swift
similarity index 100%
rename from performance/gatling_tests/src/gatling/resources/data/swiftAction.swift
rename to tests/performance/gatling_tests/src/gatling/resources/data/swiftAction.swift
diff --git a/performance/gatling_tests/src/gatling/scala/ApiV1Simulation.scala b/tests/performance/gatling_tests/src/gatling/scala/ApiV1Simulation.scala
similarity index 100%
rename from performance/gatling_tests/src/gatling/scala/ApiV1Simulation.scala
rename to tests/performance/gatling_tests/src/gatling/scala/ApiV1Simulation.scala
diff --git a/performance/gatling_tests/src/gatling/scala/BlockingInvokeOneActionSimulation.scala b/tests/performance/gatling_tests/src/gatling/scala/BlockingInvokeOneActionSimulation.scala
similarity index 100%
rename from performance/gatling_tests/src/gatling/scala/BlockingInvokeOneActionSimulation.scala
rename to tests/performance/gatling_tests/src/gatling/scala/BlockingInvokeOneActionSimulation.scala
diff --git a/performance/gatling_tests/src/gatling/scala/LatencySimulation.scala b/tests/performance/gatling_tests/src/gatling/scala/LatencySimulation.scala
similarity index 100%
rename from performance/gatling_tests/src/gatling/scala/LatencySimulation.scala
rename to tests/performance/gatling_tests/src/gatling/scala/LatencySimulation.scala
diff --git a/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskActionBuilder.scala b/tests/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskActionBuilder.scala
similarity index 100%
rename from performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskActionBuilder.scala
rename to tests/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskActionBuilder.scala
diff --git a/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskDsl.scala b/tests/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskDsl.scala
similarity index 100%
rename from performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskDsl.scala
rename to tests/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskDsl.scala
diff --git a/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskProtocolBuilder.scala b/tests/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskProtocolBuilder.scala
similarity index 100%
rename from performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskProtocolBuilder.scala
rename to tests/performance/gatling_tests/src/gatling/scala/extension/whisk/OpenWhiskProtocolBuilder.scala
diff --git a/performance/gatling_tests/src/gatling/scala/extension/whisk/Predef.scala b/tests/performance/gatling_tests/src/gatling/scala/extension/whisk/Predef.scala
similarity index 100%
rename from performance/gatling_tests/src/gatling/scala/extension/whisk/Predef.scala
rename to tests/performance/gatling_tests/src/gatling/scala/extension/whisk/Predef.scala
diff --git a/performance/preparation/create.sh b/tests/performance/preparation/create.sh
similarity index 100%
rename from performance/preparation/create.sh
rename to tests/performance/preparation/create.sh
diff --git a/performance/preparation/deploy.sh b/tests/performance/preparation/deploy.sh
similarity index 97%
rename from performance/preparation/deploy.sh
rename to tests/performance/preparation/deploy.sh
index d2e4d57..6e01097 100755
--- a/performance/preparation/deploy.sh
+++ b/tests/performance/preparation/deploy.sh
@@ -17,7 +17,7 @@
#
set -e
SCRIPTDIR="$(cd "$(dirname "$0")"; pwd)"
-ROOTDIR="$SCRIPTDIR/../.."
+ROOTDIR="$SCRIPTDIR/../../.."
# Build Openwhisk
cd $ROOTDIR
diff --git a/performance/wrk_tests/latency.sh b/tests/performance/wrk_tests/latency.sh
similarity index 100%
rename from performance/wrk_tests/latency.sh
rename to tests/performance/wrk_tests/latency.sh
diff --git a/performance/wrk_tests/post.lua b/tests/performance/wrk_tests/post.lua
similarity index 100%
rename from performance/wrk_tests/post.lua
rename to tests/performance/wrk_tests/post.lua
diff --git a/performance/wrk_tests/throughput.sh b/tests/performance/wrk_tests/throughput.sh
similarity index 100%
rename from performance/wrk_tests/throughput.sh
rename to tests/performance/wrk_tests/throughput.sh
--
To stop receiving notification emails like this one, please contact
csantanapr@apache.org.