Skip to content

Commit e8950b5

Browse files
Use focal release for travis ci
1 parent a6ad9e4 commit e8950b5

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
os: linux
19-
dist: xenial
19+
dist: focal
2020
language: java
2121
jdk: openjdk11
2222

@@ -54,6 +54,7 @@ cache:
5454
- $HOME/.gradle/wrapper/
5555

5656
before_install:
57+
- sudo systemctl stop epmd.socket epmd.service
5758
- ./tools/travis/docker.sh
5859
- sudo apt-get install -y python3-pip
5960
- pip install --user --upgrade pip setuptools six

tests/src/test/scala/org/apache/openwhisk/core/admin/WskAdminTests.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,8 @@ class WskAdminTests extends TestHelpers with WskActorSystem with Matchers with B
252252
// check correctly set
253253
val lines = wskadmin.cli(Seq("limits", "get", subject)).stdout.linesIterator.toSeq
254254
lines should have size 1
255-
lines(0) shouldBe "allowedKinds = [u'nodejs:10', u'blackbox']"
255+
lines(0) should (be("allowedKinds = [u'nodejs:10', u'blackbox']") or be(
256+
"allowedKinds = ['nodejs:10', 'blackbox']"))
256257
} finally {
257258
wskadmin.cli(Seq("limits", "delete", subject)).stdout should include("Limits deleted")
258259
}

tools/travis/runStandaloneTests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ kubectl config set-context --current --namespace=default
4646

4747
# This is required because it is timed out to pull the image during the test.
4848
docker pull openwhisk/action-nodejs-v10:nightly
49+
docker pull openwhisk/dockerskeleton:nightly
4950

5051
cd $ROOTDIR
5152
TERM=dumb ./gradlew :core:standalone:build \

tools/travis/scan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ cd $ROOTDIR
4141
TERM=dumb ./gradlew checkScalafmtAll
4242

4343
# lint tests to all be actually runnable
44-
MISSING_TESTS=$(grep -rL "RunWith" --include="*Tests.scala" tests)
44+
MISSING_TESTS=$(grep -rL "RunWith" --include="*Tests.scala" tests || true)
4545
if [ -n "$MISSING_TESTS" ]
4646
then
4747
echo "The following tests are missing the 'RunWith' annotation"

tools/travis/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function retry() {
3434
python -m pip install --user couchdb
3535

3636
# Ansible
37-
python -m pip install --user ansible==2.5.2
37+
python -m pip install --user ansible==2.8.18
3838

3939
# Azure CosmosDB
4040
python -m pip install --user pydocumentdb

tools/travis/setupSystem.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ SCRIPTDIR=$(cd $(dirname "$0") && pwd)
2424
ROOTDIR="$SCRIPTDIR/../.."
2525
RUNTIMES_MANIFEST=${1:-"/ansible/files/runtimes.json"}
2626

27+
# This is required because it is timed out to pull the image during the test.
28+
docker pull openwhisk/example
29+
2730
cd $ROOTDIR/ansible
2831

2932
$ANSIBLE_CMD openwhisk.yml -e manifest_file="$RUNTIMES_MANIFEST" -e db_activation_backend=ElasticSearch

0 commit comments

Comments
 (0)