[openwhisk] branch master updated: Use focal release for travis ci (#5052)

[st...@apache.org]

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 5a847e3  Use focal release for travis ci (#5052)
5a847e3 is described below

commit 5a847e3c71c27707776e6d9d135bbb78e8275e5a
Author: jiangpch <ji...@navercorp.com>
AuthorDate: Mon Jan 25 17:43:37 2021 +0800

    Use focal release for travis ci (#5052)
---
 .travis.yml                                                            | 3 ++-
 .../src/test/scala/org/apache/openwhisk/core/admin/WskAdminTests.scala | 3 ++-
 tools/travis/runStandaloneTests.sh                                     | 1 +
 tools/travis/scan.sh                                                   | 2 +-
 tools/travis/setup.sh                                                  | 2 +-
 tools/travis/setupSystem.sh                                            | 3 +++
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 29c2004..b9fd9af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
 #
 
 os: linux
-dist: xenial
+dist: focal
 language: java
 jdk: openjdk11
 
@@ -54,6 +54,7 @@ cache:
     - $HOME/.gradle/wrapper/
 
 before_install:
+  - sudo systemctl stop epmd.socket epmd.service
   - ./tools/travis/docker.sh
   - sudo apt-get install -y python3-pip
   - pip install --user --upgrade pip setuptools six
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/admin/WskAdminTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/admin/WskAdminTests.scala
index 7e1ccd0..03ab70c 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/admin/WskAdminTests.scala
+++ b/tests/src/test/scala/org/apache/openwhisk/core/admin/WskAdminTests.scala
@@ -252,7 +252,8 @@ class WskAdminTests extends TestHelpers with WskActorSystem with Matchers with B
       // check correctly set
       val lines = wskadmin.cli(Seq("limits", "get", subject)).stdout.linesIterator.toSeq
       lines should have size 1
-      lines(0) shouldBe "allowedKinds = [u'nodejs:10', u'blackbox']"
+      lines(0) should (be("allowedKinds = [u'nodejs:10', u'blackbox']") or be(
+        "allowedKinds = ['nodejs:10', 'blackbox']"))
     } finally {
       wskadmin.cli(Seq("limits", "delete", subject)).stdout should include("Limits deleted")
     }
diff --git a/tools/travis/runStandaloneTests.sh b/tools/travis/runStandaloneTests.sh
index 07af2b7..0d11294 100755
--- a/tools/travis/runStandaloneTests.sh
+++ b/tools/travis/runStandaloneTests.sh
@@ -46,6 +46,7 @@ kubectl config set-context --current --namespace=default
 
 # This is required because it is timed out to pull the image during the test.
 docker pull openwhisk/action-nodejs-v10:nightly
+docker pull openwhisk/dockerskeleton:nightly
 
 cd $ROOTDIR
 TERM=dumb ./gradlew :core:standalone:build \
diff --git a/tools/travis/scan.sh b/tools/travis/scan.sh
index a736e5a..9a69413 100755
--- a/tools/travis/scan.sh
+++ b/tools/travis/scan.sh
@@ -41,7 +41,7 @@ cd $ROOTDIR
 TERM=dumb ./gradlew checkScalafmtAll
 
 # lint tests to all be actually runnable
-MISSING_TESTS=$(grep -rL "RunWith" --include="*Tests.scala" tests)
+MISSING_TESTS=$(grep -rL "RunWith" --include="*Tests.scala" tests || true)
 if [ -n "$MISSING_TESTS" ]
 then
   echo "The following tests are missing the 'RunWith' annotation"
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 88bbeed..758d5a0 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -34,7 +34,7 @@ function retry() {
 python -m pip install --user couchdb
 
 # Ansible
-python -m pip install --user ansible==2.5.2
+python -m pip install --user ansible==2.8.18
 
 # Azure CosmosDB
 python -m pip install --user pydocumentdb
diff --git a/tools/travis/setupSystem.sh b/tools/travis/setupSystem.sh
index 9f99cf7..387d45c 100755
--- a/tools/travis/setupSystem.sh
+++ b/tools/travis/setupSystem.sh
@@ -24,6 +24,9 @@ SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../.."
 RUNTIMES_MANIFEST=${1:-"/ansible/files/runtimes.json"}
 
+# This is required because it is timed out to pull the image during the test.
+docker pull openwhisk/example
+
 cd $ROOTDIR/ansible
 
 $ANSIBLE_CMD openwhisk.yml -e manifest_file="$RUNTIMES_MANIFEST" -e db_activation_backend=ElasticSearch