This is an automated email from the ASF dual-hosted git repository.
ethanli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 6b3922f [STORM-3711] Fix ARM CI with wrong usage of "arm64-graviton2"
resources (#3348)
6b3922f is described below
commit 6b3922f8a2ee41d24538213626555d460a3d5415
Author: Liu sheng <[email protected]>
AuthorDate: Thu Dec 17 10:39:16 2020 +0800
[STORM-3711] Fix ARM CI with wrong usage of "arm64-graviton2" resources
(#3348)
---
.travis.yml | 9 ++++++---
integration-test/run-it.sh | 15 +++++++++++----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8e947ca..f99a2e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ addons:
arch:
- amd64
- - arm64-graviton2
+ - arm64
env:
- MODULES=Client
@@ -25,7 +25,7 @@ env:
- MODULES=Integration-Test
- MODULES=Check-Updated-License-Files
-dist: trusty
+dist: xenial
sudo: required
before_cache:
@@ -34,13 +34,16 @@ before_cache:
language: java
jdk:
- - oraclejdk8
+ - openjdk8
- openjdk11
matrix:
include:
- arch: s390x
jdk: openjdk11
+ exclude:
+ - arch: arm64
+ jdk: openjdk8
before_install:
- rvm reload
diff --git a/integration-test/run-it.sh b/integration-test/run-it.sh
index d9b8856..8298378 100755
--- a/integration-test/run-it.sh
+++ b/integration-test/run-it.sh
@@ -36,10 +36,13 @@ then
chmod o+rx /home/travis
fi
list_storm_processes || true
-# increasing swap space so we can run lots of workers
-sudo dd if=/dev/zero of=/swapfile.img bs=4096 count=1M
-sudo mkswap /swapfile.img
-sudo swapon /swapfile.img
+if [ "$(uname -m)" != aarch64 ]; then
+ # increasing swap space so we can run lots of workers
+ sudo dd if=/dev/zero of=/swapfile.img bs=4096 count=1M
+ sudo mkswap /swapfile.img
+ sudo swapon /swapfile.img
+fi
+
if [[ "${USER}" == "vagrant" ]]; then # install oracle jdk8 or openjdk11
sudo apt-get update
@@ -101,3 +104,7 @@ for i in {1..20} ; do
done
list_storm_processes
mvn test -DfailIfNoTests=false -DskipTests=false
-Dstorm.version=${STORM_VERSION} -Dui.url=http://localhost:8744
+
+# Kill all storm processes after tests running, otherwise the Travis CI(ARM)
will still wait and then fail by
+# timeout error even though all the tests passed
+sudo pkill -9 -u storm
