Skip to content

Commit ab412be

Browse files
dgrove-osschetanmeh
authored andcommitted
Fixes for travis build. (#460)
1. fix pip install 2. fix for gradle5 Co-authored-by: Chetan Mehrotra <chetanm@apache.org>
1 parent 3669173 commit ab412be

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ matrix:
2121
include:
2222
- os: linux
2323
sudo: required
24-
group: deprecated-2017Q3
2524
go: "1.9.3"
2625
services: docker
26+
dist: xenial
2727

2828
env:
2929
global:
@@ -47,7 +47,7 @@ before_install:
4747

4848
install:
4949
- cd $TRAVIS_BUILD_DIR/..
50-
- pip install --upgrade pip setuptools
50+
- pip install --user --upgrade pip setuptools
5151

5252
before_script:
5353
- cd $TRAVIS_BUILD_DIR

tests/src/test/scala/system/basic/WskCliBasicTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
874874
behavior of "Wsk Namespace CLI"
875875

876876
def WskNsCLI_RetListOneNs_test(wsk: Wsk, wp: WskProps): Unit = {
877-
val lines = wsk.namespace.list()(wp).stdout.lines.toSeq
877+
val lines = wsk.namespace.list()(wp).stdout.linesIterator.toSeq
878878
lines should have size 2
879879
lines.head shouldBe "namespaces"
880880
lines(1).trim should not be empty

tools/travis/test_openwhisk.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ $ANSIBLE_CMD routemgmt.yml
9898

9999
# Run the test cases under openwhisk to ensure the quality of the runnint API.
100100
cd $TRAVIS_BUILD_DIR
101-
./gradlew --console=plain :tests:test -Dtest.single=*ApiGwCliTests*
101+
./gradlew --console=plain :tests:test --tests=*ApiGwCliTests*
102102
sleep 30
103-
./gradlew --console=plain :tests:test -Dtest.single=*ApiGwCliRoutemgmtActionTests*
103+
./gradlew --console=plain :tests:test --tests=*ApiGwCliRoutemgmtActionTests*
104104
sleep 30
105-
./gradlew --console=plain :tests:test -Dtest.single=*ApiGwCliEndToEndTests*
105+
./gradlew --console=plain :tests:test --tests=*ApiGwCliEndToEndTests*
106106
sleep 30
107-
./gradlew --console=plain :tests:test -Dtest.single=*Wsk*Tests*
107+
./gradlew --console=plain :tests:test --tests=*Wsk*Tests*
108108

109109
#
110110
# Finally, run the integration test for the CLI

0 commit comments

Comments
 (0)