Merge pull request #3523 from rzo1/STORM-3894
STORM-3894 - SnakeYAML 2.0
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 15586af..ae3b86f 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -29,8 +29,7 @@
matrix:
os: [ ubuntu-latest ]
java: [ 8, 11 ]
- # Ignore 'Integration-Test' atm as it is highly Travis specific
- module: [ Client, Server, Core, External, Check-Updated-License-Files ]
+ module: [ Client, Server, Core, External, Check-Updated-License-Files, Integration-Test ]
experimental: [false]
fail-fast: false
steps:
@@ -67,4 +66,7 @@
- name: Set up project dependencies
run: /bin/bash ./dev-tools/travis/travis-install.sh `pwd`
- name: Run build
- run: /bin/bash ./dev-tools/travis/travis-script.sh `pwd` ${{ matrix.module }};
\ No newline at end of file
+ run: |
+ export JDK_VERSION=${{ matrix.java }}
+ export USER=github
+ /bin/bash ./dev-tools/travis/travis-script.sh `pwd` ${{ matrix.module }};
\ No newline at end of file
diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh
index 6908596..2178ad2 100755
--- a/dev-tools/travis/travis-script.sh
+++ b/dev-tools/travis/travis-script.sh
@@ -41,7 +41,7 @@
TEST_MODULES=storm-core
elif [ "$2" == "External" ]
then
- if [ "$TRAVIS_JDK_VERSION" == "openjdk11" ]
+ if [ "$JDK_VERSION" == "11" ]
then
TEST_MODULES='!storm-client,!storm-server,!storm-core,!storm-webapp,!storm-shaded-deps,!external/storm-cassandra,!external/storm-hive,!external/storm-hdfs,!external/storm-hbase,!sql/storm-sql-external/storm-sql-hdfs,!external/storm-hdfs-blobstore'
else
diff --git a/integration-test/run-it.sh b/integration-test/run-it.sh
index 8298378..3b1f10e 100755
--- a/integration-test/run-it.sh
+++ b/integration-test/run-it.sh
@@ -30,11 +30,6 @@
(ps -ef | grep -i -e zookeeper | grep -v grep) && (ps -ef | grep -i -e storm.home | grep -v grep)
}
-if [[ "$TRAVIS_JDK_VERSION" == "openjdk11" ]]
-then
- #Work around https://github.com/travis-ci/travis-ci/issues/9784
- chmod o+rx /home/travis
-fi
list_storm_processes || true
if [ "$(uname -m)" != aarch64 ]; then
# increasing swap space so we can run lots of workers
@@ -64,8 +59,7 @@
mvn --version
export MAVEN_OPTS="-Xmx3000m"
else
- ( while true; do echo "heartbeat"; sleep 300; done ) & #heartbeat needed by travis ci
- if [[ "${USER}" == "travis" ]]; then
+ if [[ "${USER}" == "github" ]]; then
( cd "${STORM_SRC_DIR}/storm-dist/binary" && mvn clean package -Dgpg.skip=true )
fi
(( $(find "${STORM_SRC_DIR}/storm-dist/binary" -iname 'apache-storm*.zip' | wc -l) == 1 )) || die "expected exactly one zip file, did you run: cd ${STORM_SRC_DIR}/storm-dist/binary && mvn clean package -Dgpg.skip=true"
