This is an automated email from the ASF dual-hosted git repository.
style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 4a13303 [New Scheduler] CI for testing related new scheduler (#5068)
4a13303 is described below
commit 4a13303fae4d9750da6662bb39b3ec92d6ccf56c
Author: 김건희 <[email protected]>
AuthorDate: Thu Feb 18 08:31:13 2021 +0900
[New Scheduler] CI for testing related new scheduler (#5068)
* Add task for testing related to the scheduler
* Add Scheduler to request template
* Add travis job for testing scheduler
---
.github/PULL_REQUEST_TEMPLATE.md | 1 +
.travis.yml | 4 ++++
tests/build.gradle | 17 +++++++----------
tools/travis/runSchedulerTests.sh | 35 +++++++++++++++++++++++++++++++++++
4 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3edaa10..cb7a84a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,6 +16,7 @@
- [ ] Controller
- [ ] Message Bus (e.g., Kafka)
- [ ] Loadbalancer
+- [ ] Scheduler
- [ ] Invoker
- [ ] Intrinsic actions (e.g., sequences, conductors)
- [ ] Data stores (e.g., CouchDB)
diff --git a/.travis.yml b/.travis.yml
index b9fd9af..25d3d68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,3 +100,7 @@ jobs:
- OPENWHISK_HOST="172.17.0.1" USERS="1" REQUESTS_PER_SEC="1" ./gradlew
gatlingRun-org.apache.openwhisk.ColdBlockingInvokeSimulation
- ./tools/travis/checkAndUploadLogs.sh perf
name: "Performance Tests"
+ - script:
+ - ./tools/travis/runSchedulerTests.sh
+ - ./tools/travis/checkAndUploadLogs.sh scheduler
+ name: "Scheduler Tests"
diff --git a/tests/build.gradle b/tests/build.gradle
index f75800e..b9100ed 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -53,7 +53,6 @@ def systemIncludes = [
"org/apache/openwhisk/core/apigw/actions/test/**",
"org/apache/openwhisk/core/database/test/*CacheConcurrencyTests*",
"org/apache/openwhisk/core/controller/test/*ControllerApiTests*",
-
"org/apache/openwhisk/core/scheduler/queue/test/ElasticSearchDurationCheck*",
"apigw/healthtests/**",
"ha/**",
"services/**",
@@ -72,7 +71,7 @@ ext.testSets = [
"org/apache/openwhisk/standalone/**",
"org/apache/openwhisk/core/cli/test/**",
"org/apache/openwhisk/core/limits/**",
-
"org/apache/openwhisk/core/scheduler/queue/test/ElasticSearchDurationCheck*",
+ "org/apache/openwhisk/core/scheduler/**",
"org/apache/openwhisk/common/etcd/**",
"**/*CacheConcurrencyTests*",
"**/*ControllerApiTests*",
@@ -87,6 +86,12 @@ ext.testSets = [
'invokerShoot/**'
]
],
+ "REQUIRE_SCHEDULER" : [
+ "includes" : [
+ "org/apache/openwhisk/common/etcd/**",
+ "org/apache/openwhisk/core/scheduler/**",
+ ]
+ ],
"REQUIRE_MULTI_RUNTIME" : [
"includes" : [
"system/basic/*MultiRuntimeTests*",
@@ -198,14 +203,6 @@ task testUnit(type: Test) {
exclude couchDbExcludes
}
-task testUnitEtcd(type: Test) {
- def etcdUnitIncludes = [
- "org/apache/openwhisk/common/etcd/**"
- ]
-
- include etcdUnitIncludes
-}
-
dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile "org.apache.commons:commons-lang3:3.3.2"
diff --git a/tools/travis/runSchedulerTests.sh
b/tools/travis/runSchedulerTests.sh
new file mode 100755
index 0000000..000de80
--- /dev/null
+++ b/tools/travis/runSchedulerTests.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env 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.
+#
+
+set -e
+
+SCRIPTDIR=$(cd $(dirname "$0") && pwd)
+ROOTDIR="$SCRIPTDIR/../.."
+
+cd $ROOTDIR/tools/travis
+export ORG_GRADLE_PROJECT_testSetName="REQUIRE_SCHEDULER"
+export GRADLE_COVERAGE=true
+
+./setupPrereq.sh /ansible/files/runtimes-nodeonly.json
+
+./distDocker.sh
+
+./setupSystem.sh /ansible/files/runtimes-nodeonly.json
+
+./runTests.sh
