[STORM-3711] Fix ARM CI with wrong usage of "arm64-graviton2" resources (#3348)
diff --git a/.travis.yml b/.travis.yml
index 8e947ca..f99a2e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@
arch:
- amd64
- - arm64-graviton2
+ - arm64
env:
- MODULES=Client
@@ -25,7 +25,7 @@
- MODULES=Integration-Test
- MODULES=Check-Updated-License-Files
-dist: trusty
+dist: xenial
sudo: required
before_cache:
@@ -34,13 +34,16 @@
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 @@
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 @@
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
