From 270b42f41a3e4f322af8e23905de8e2292a70667 Mon Sep 17 00:00:00 2001 From: David Grove Date: Fri, 11 Dec 2020 14:12:32 -0500 Subject: [PATCH 1/6] update travis badge for migration to travis-ci.com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da57926427a..7f8bc32174a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ # OpenWhisk -[![Build Status](https://travis-ci.org/apache/openwhisk.svg?branch=master)](https://travis-ci.org/apache/openwhisk) +[![Build Status](https://travis-ci.com/apache/openwhisk.svg?branch=master)](https://travis-ci.com/apache/openwhisk) [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Join Slack](https://img.shields.io/badge/join-slack-9B69A0.svg)](https://openwhisk-team.slack.com/) [![codecov](https://codecov.io/gh/apache/openwhisk/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/openwhisk) From 62c62af46c08fb73be522175c8030141bf4c465d Mon Sep 17 00:00:00 2001 From: David Grove Date: Sat, 12 Dec 2020 18:15:20 -0500 Subject: [PATCH 2/6] re-encrypt travis2slack url --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06b7ad13351..35dcb1d4a29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ notifications: webhooks: urls: # travis2slack webhook to enable DMs on openwhisk-team.slack.com to PR authors with TravisCI results - secure: "tYJIDAKtHp+yLw53yB6+TQnNfyNwZDAZyG7QmHbNP5Mf1HR0GLhpe02AjV99NkjAgaGYxngUELMhNOyB8eiyMdxpemwny4oOeyOUQzVmiry/804JnjK2YvHyAGFVGuhV0LZVfCPsPh5x91yKcDPLSqRSTKhZOiJFmDpBy4qzxM4W7IXxAM+yHKrm8cznBRdR5rGxT5IjV58xMB1p69jJy1rxnjtEWmB2z7j/SiKa6IQlVYgr+BgaJxBhy9WYYczvceU+qyrTWpVYy5P3o5+b0MZ/UkyB5CZT9N5LzLGjLRDqNaNYCT3U8ow1H6w+zY7/9KrAf6szT6raN606vN7uv7TqGEugG949JQfRSQNe3Y7IvTAHatI9VAc3opWgy0jm7eBu9pzSECamGGSGGHl18m7oWZypiwB+ooKg7k545XQCoVwlRulBvwnVO8w2HOjkKSds/JnNhdXLtNKRaBaZxhBkk+5b43k59vaYsHDXaYFUob/nG/K3JoPRkcLtFe3JfNsCABJYC0VbRE3AizHr8CYMhBUrgElPFwPmIJwwLOORq6y3zIRxTOIz4b/x2q9Oa17vK0IwAjgHi8y9RXc6lG0mCyVFScdpxoGF3d9xF8Edwc8WN22pYaZ8r71UF4AWOVxJs1Cnp8gcAn14gONVVvkaVCUwNCCElbJkjdVhhnI=" + secure: "qSkFNkMDYhp025vW+hBWO4wlMEeaz2S2c3tsZgIhcqji58AAxL2KKuNIWAuzftIxC5l5RwPt/OBXWFjgnAwCjj3hfczMfpuexGPruzmRe2GYbBwS0OhwDkWVosl9UqFELbZEdQ/tTJyW7p3Gd4FSjCJBCAdRL5yYcn3RiCj/UrJ6454IkKqeuTihWp2ZklqnZpMv9WzC4DK+cI/rJUP5megh/gilORfBD5/wnMMksC5NSlpc2WAtdeKusVZiZ6ieR6uLoR3rwzgUBC3PbyX8GO1OIh+LnvO7c0Hrhc2u685nxrCMseJIH9kZQboGA7RbiH64U5Zy7dK6fiFGfQJc3YyfsbKBKyd0QlvZp1vKw4iAvtsyentodjR1lN29fuTUW3hPMCo/YJSxZmHHMRSsoqs4zMp7lHo0aDfBOJRB+jjluA96Tn8SZjIATu76SwzJ0EolyVGw25HqKxSX0eM0ZLgrVrh89CwSlEYop07lQzaa1QTFu9DizONS8jlQYpXoAdgfeBXPDCyHVUzYjljzKyZG2Ph86eEo1mdHOlDyPI0hHuspBObP/mxSKXldxgBDRJ2jvF75t9DcxZdDzis5HBZeEktyIFaLS7spHlQLqGNEnpxNc+FxpT52Uw/sYJ6e1OG2Qx3Jhz4NNo4wJWUkdS1saaFCxIlyh7pqjpnsWqU=" # specific cache configuration for gradle based builds # see: https://docs.travis-ci.com/user/languages/java/#caching From 68c8b74df6b9881fc65994ceb2f8cc0ab1763120 Mon Sep 17 00:00:00 2001 From: "jiang.pengcheng" Date: Fri, 8 Jan 2021 15:29:25 +0800 Subject: [PATCH 3/6] Fix error --- .travis.yml | 3 ++- tools/travis/scan.sh | 2 +- tools/travis/setup.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35dcb1d4a29..24b4f767245 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/tools/travis/scan.sh b/tools/travis/scan.sh index a736e5a62d4..9a69413d30c 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 35705e1a83a..efef0c0ac77 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -34,7 +34,7 @@ function retry() { pip install --user couchdb # Ansible -pip install --user ansible==2.5.2 +pip install --user ansible==2.8.18 # Azure CosmosDB pip install --user pydocumentdb From ff871321a3cae6d86ac2ceeedf49d1f079ab5188 Mon Sep 17 00:00:00 2001 From: "jiang.pengcheng" Date: Wed, 13 Jan 2021 15:53:21 +0800 Subject: [PATCH 4/6] Fix WskAdminTests --- .../scala/org/apache/openwhisk/core/admin/WskAdminTests.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 7e1ccd0c4c8..03ab70c3051 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") } From b287c24460e5cbd11ef0aea6644d494491276df3 Mon Sep 17 00:00:00 2001 From: "jiang.pengcheng" Date: Fri, 15 Jan 2021 08:52:02 +0800 Subject: [PATCH 5/6] Pull nodejs10 first when do standalone test --- tools/travis/runStandaloneTests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/travis/runStandaloneTests.sh b/tools/travis/runStandaloneTests.sh index e4280f15fc8..b4054a6676f 100755 --- a/tools/travis/runStandaloneTests.sh +++ b/tools/travis/runStandaloneTests.sh @@ -44,6 +44,7 @@ kind create cluster --wait 5m export KUBECONFIG="$(kind get kubeconfig-path)" kubectl config set-context --current --namespace=default +docker pull openwhisk/action-nodejs-v10:nightly cd $ROOTDIR TERM=dumb ./gradlew :core:standalone:build \ From 084f1c462b3026b8773a92ab64dc91c56b08f7f8 Mon Sep 17 00:00:00 2001 From: "jiang.pengcheng" Date: Fri, 15 Jan 2021 09:01:37 +0800 Subject: [PATCH 6/6] Pull required images before test --- tools/travis/runStandaloneTests.sh | 1 + tools/travis/setupSystem.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tools/travis/runStandaloneTests.sh b/tools/travis/runStandaloneTests.sh index b4054a6676f..56915965b5a 100755 --- a/tools/travis/runStandaloneTests.sh +++ b/tools/travis/runStandaloneTests.sh @@ -45,6 +45,7 @@ export KUBECONFIG="$(kind get kubeconfig-path)" kubectl config set-context --current --namespace=default 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/setupSystem.sh b/tools/travis/setupSystem.sh index 0750dddcf1c..fcc9db43f2e 100755 --- a/tools/travis/setupSystem.sh +++ b/tools/travis/setupSystem.sh @@ -24,6 +24,8 @@ SCRIPTDIR=$(cd $(dirname "$0") && pwd) ROOTDIR="$SCRIPTDIR/../.." RUNTIMES_MANIFEST=${1:-"/ansible/files/runtimes.json"} +docker pull openwhisk/example + cd $ROOTDIR/ansible $ANSIBLE_CMD openwhisk.yml -e manifest_file="$RUNTIMES_MANIFEST"