Skip to content

Commit 4a13303

Browse files
authored
[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
1 parent 4d88ca7 commit 4a13303

File tree

4 files changed

+47
-10
lines changed

4 files changed

+47
-10
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- [ ] Controller
1717
- [ ] Message Bus (e.g., Kafka)
1818
- [ ] Loadbalancer
19+
- [ ] Scheduler
1920
- [ ] Invoker
2021
- [ ] Intrinsic actions (e.g., sequences, conductors)
2122
- [ ] Data stores (e.g., CouchDB)

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,7 @@ jobs:
100100
- OPENWHISK_HOST="172.17.0.1" USERS="1" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-org.apache.openwhisk.ColdBlockingInvokeSimulation
101101
- ./tools/travis/checkAndUploadLogs.sh perf
102102
name: "Performance Tests"
103+
- script:
104+
- ./tools/travis/runSchedulerTests.sh
105+
- ./tools/travis/checkAndUploadLogs.sh scheduler
106+
name: "Scheduler Tests"

tests/build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def systemIncludes = [
5353
"org/apache/openwhisk/core/apigw/actions/test/**",
5454
"org/apache/openwhisk/core/database/test/*CacheConcurrencyTests*",
5555
"org/apache/openwhisk/core/controller/test/*ControllerApiTests*",
56-
"org/apache/openwhisk/core/scheduler/queue/test/ElasticSearchDurationCheck*",
5756
"apigw/healthtests/**",
5857
"ha/**",
5958
"services/**",
@@ -72,7 +71,7 @@ ext.testSets = [
7271
"org/apache/openwhisk/standalone/**",
7372
"org/apache/openwhisk/core/cli/test/**",
7473
"org/apache/openwhisk/core/limits/**",
75-
"org/apache/openwhisk/core/scheduler/queue/test/ElasticSearchDurationCheck*",
74+
"org/apache/openwhisk/core/scheduler/**",
7675
"org/apache/openwhisk/common/etcd/**",
7776
"**/*CacheConcurrencyTests*",
7877
"**/*ControllerApiTests*",
@@ -87,6 +86,12 @@ ext.testSets = [
8786
'invokerShoot/**'
8887
]
8988
],
89+
"REQUIRE_SCHEDULER" : [
90+
"includes" : [
91+
"org/apache/openwhisk/common/etcd/**",
92+
"org/apache/openwhisk/core/scheduler/**",
93+
]
94+
],
9095
"REQUIRE_MULTI_RUNTIME" : [
9196
"includes" : [
9297
"system/basic/*MultiRuntimeTests*",
@@ -198,14 +203,6 @@ task testUnit(type: Test) {
198203
exclude couchDbExcludes
199204
}
200205

201-
task testUnitEtcd(type: Test) {
202-
def etcdUnitIncludes = [
203-
"org/apache/openwhisk/common/etcd/**"
204-
]
205-
206-
include etcdUnitIncludes
207-
}
208-
209206
dependencies {
210207
compile "org.scala-lang:scala-library:${gradle.scala.version}"
211208
compile "org.apache.commons:commons-lang3:3.3.2"

tools/travis/runSchedulerTests.sh

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
3+
#
4+
# Licensed to the Apache Software Foundation (ASF) under one or more
5+
# contributor license agreements. See the NOTICE file distributed with
6+
# this work for additional information regarding copyright ownership.
7+
# The ASF licenses this file to You under the Apache License, Version 2.0
8+
# (the "License"); you may not use this file except in compliance with
9+
# the License. You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
20+
set -e
21+
22+
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
23+
ROOTDIR="$SCRIPTDIR/../.."
24+
25+
cd $ROOTDIR/tools/travis
26+
export ORG_GRADLE_PROJECT_testSetName="REQUIRE_SCHEDULER"
27+
export GRADLE_COVERAGE=true
28+
29+
./setupPrereq.sh /ansible/files/runtimes-nodeonly.json
30+
31+
./distDocker.sh
32+
33+
./setupSystem.sh /ansible/files/runtimes-nodeonly.json
34+
35+
./runTests.sh

0 commit comments

Comments
 (0)