This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push: new 98803b786a Rebalance unit test and integration test time for github action (#11230) 98803b786a is described below commit 98803b786a0826ce0af88be310765f458cfc0450 Author: Xiang Fu <xiangfu.1...@gmail.com> AuthorDate: Tue Aug 1 16:54:25 2023 -0700 Rebalance unit test and integration test time for github action (#11230) --- .github/workflows/scripts/.pinot_quickstart.sh | 7 ++---- .github/workflows/scripts/.pinot_test.sh | 30 +++++++------------------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/.github/workflows/scripts/.pinot_quickstart.sh b/.github/workflows/scripts/.pinot_quickstart.sh index d78f647c0c..18ebf7132e 100755 --- a/.github/workflows/scripts/.pinot_quickstart.sh +++ b/.github/workflows/scripts/.pinot_quickstart.sh @@ -64,14 +64,11 @@ jdk_version() { JAVA_VER="$(jdk_version)" # Build +echo "Building Pinot to JAVA 11 source code Using JDK ${JAVA_VER}" PASS=0 for i in $(seq 1 2) do - if [ "$JAVA_VER" -gt 11 ] ; then - mvn clean install -B -Dmaven.test.skip=true -Pbin-dist -Dmaven.javadoc.skip=true -Djdk.version=11 - else - mvn clean install -B -Dmaven.test.skip=true -Pbin-dist -Dmaven.javadoc.skip=true -Djdk.version=${JAVA_VER} - fi + mvn clean install -B -T1C -Dmaven.test.skip=true -Pbin-dist -Dmaven.javadoc.skip=true -Djdk.version=11 if [ $? -eq 0 ]; then PASS=1 break; diff --git a/.github/workflows/scripts/.pinot_test.sh b/.github/workflows/scripts/.pinot_test.sh index 1608b6f7e9..8f71612966 100755 --- a/.github/workflows/scripts/.pinot_test.sh +++ b/.github/workflows/scripts/.pinot_test.sh @@ -27,21 +27,21 @@ netstat -i if [ "$RUN_INTEGRATION_TESTS" != false ]; then # Integration Tests - mvn clean install -DskipTests -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true -am -B \ + mvn clean install -DskipTests -Dcheckstyle.skip -Dspotless.skip -Denforcer.skip -Dlicense.skip -am -B \ -pl 'pinot-integration-tests' -T 16 || exit 1 if [ "$RUN_TEST_SET" == "1" ]; then mvn test -am -B \ -pl 'pinot-integration-tests' \ - -Dtest='C*Test,L*Test,M*Test,R*Test,S*Test' \ + -Dtest='A*Test,B*Test,C*Test,D*Test,E*Test,F*Test,G*Test,H*Test,I*Test,J*Test,K*Test,L*Test,P*Test,Q*Test,R*Test' \ -P github-actions,integration-tests-only \ - -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true && exit 0 || exit 1 + -Dcheckstyle.skip -Dspotless.skip -Denforcer.skip -Dlicense.skip && exit 0 || exit 1 fi if [ "$RUN_TEST_SET" == "2" ]; then mvn test -am -B \ -pl 'pinot-integration-tests' \ - -Dtest='!C*Test,!L*Test,!M*Test,!R*Test,!S*Test' \ + -Dtest='M*Test,N*Test,O*Test,S*Test,T*Test,U*Test,V*Test,W*Test,X*Test,Y*Test,Z*Test' \ -P github-actions,integration-tests-only \ - -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true && exit 0 || exit 1 + -Dcheckstyle.skip -Dspotless.skip -Denforcer.skip -Dlicense.skip && exit 0 || exit 1 fi else # Unit Tests @@ -56,18 +56,11 @@ else -pl 'pinot-core' \ -pl 'pinot-query-planner' \ -pl 'pinot-query-runtime' \ - -pl 'pinot-server' \ - -pl ':pinot-yammer' \ - -pl ':pinot-avro-base' \ - -pl ':pinot-avro' \ - -pl ':pinot-csv' \ - -pl ':pinot-json' \ - -pl ':pinot-segment-uploader-default' \ -P github-actions,no-integration-tests \ - -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true && exit 0 || exit 1 + -Dcheckstyle.skip -Dspotless.skip -Denforcer.skip -Dlicense.skip && exit 0 || exit 1 fi if [ "$RUN_TEST_SET" == "2" ]; then - mvn clean install -DskipTests -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true -T 16 || exit 1 + mvn clean install -DskipTests -Dcheckstyle.skip -Dspotless.skip -Denforcer.skip -Dlicense.skip -T 16 || exit 1 mvn test -am -B \ -pl '!pinot-spi' \ -pl '!pinot-segment-spi' \ @@ -76,15 +69,8 @@ else -pl '!pinot-core' \ -pl '!pinot-query-planner' \ -pl '!pinot-query-runtime' \ - -pl '!pinot-server' \ - -pl '!:pinot-yammer' \ - -pl '!:pinot-avro-base' \ - -pl '!:pinot-avro' \ - -pl '!:pinot-csv' \ - -pl '!:pinot-json' \ - -pl '!:pinot-segment-uploader-default' \ -P github-actions,no-integration-tests \ - -Dspotless.apply.skip -Dcheckstyle.skip -Dspotless.apply.skip -Dlicense.skip=true \ + -Dspotless.skip -Dcheckstyle.skip -Denforcer.skip -Dlicense.skip \ && exit 0 || exit 1 fi fi --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org