Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use focal release for travis ci #5052

Merged
merged 1 commit into from
Jan 25, 2021
Merged

Use focal release for travis ci #5052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

os: linux
dist: xenial
dist: focal
language: java
jdk: openjdk11

Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/src/test/scala/org/apache/openwhisk/core/admin/WskAdminTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']"))
Copy link
Contributor

@ningyougang ningyougang Jul 30, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my env, seems here has relation with python version, test as below:

  • If use python3 as default: ln -s /usr/bin/python3 /usr/bin/python

    lines(0) is ['nodejs:10', 'blackbox']

  • If use python2 as default: ln -s /usr/bin/python2 /usr/bin/python

    lines(0) is [u'nodejs:10', u'blackbox']

So here meets 2 cases.

} finally {
wskadmin.cli(Seq("limits", "delete", subject)).stdout should include("Limits deleted")
}
Expand Down
1 change: 1 addition & 0 deletions tools/travis/runStandaloneTests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tools/travis/scan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tools/travis/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions tools/travis/setupSystem.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down