This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 1648e52d4263e7642a8ec5b4f94e0329c8ee5c16
Author: XiaoxiangYu <x...@apache.org>
AuthorDate: Tue Aug 15 17:53:09 2023 +0800
Fix compress.sh
---
build/release/compress.sh | 4 ++--
dev-support/unit_testing.sh | 14 +++++++-------
pom.xml | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build/release/compress.sh b/build/release/compress.sh
index 0db79ca908..38b222cf4e 100755
--- a/build/release/compress.sh
+++ b/build/release/compress.sh
@@ -65,7 +65,7 @@ cp -rf ../build/deploy/grafana/custom.ini
${package_name}/tool/grafana/
# Add JDBC Driver
bash release/jdbc_package.sh
-cp ../jdbc_dist/kylin-jdbc-${RELEASE_VERSION}.tar.gz "${package_name}"/lib
+cp ../jdbc_dist/kylin-jdbc-*.tar.gz "${package_name}"/lib
# Add conf profiles
mkdir -p ${package_name}/conf
@@ -93,7 +93,7 @@ rm -rf ext lib commit_SHA1 VERSION # keep the spark folder on
purpose
cp -rf server/webapp/dist ${package_name}/server/public
cp -rf server/newten.jar ${package_name}/server/
cp -rf server/jars ${package_name}/server/
-cp -rf deploy/.keystore ${package_name}/server/
+# cp -rf deploy/.keystore ${package_name}/server/
# mv ${package_name}/server/jars/log4j* ${package_name}/spark/jars/
rm -rf server/
diff --git a/dev-support/unit_testing.sh b/dev-support/unit_testing.sh
index d9b30181d5..1cea8a620b 100644
--- a/dev-support/unit_testing.sh
+++ b/dev-support/unit_testing.sh
@@ -17,8 +17,8 @@
# limitations under the License.
#
-# use `bash unit_testing.sh` to run unit test of core part
-# use `bash unit_testing.sh -all` to run Integrate Test of all modules
+# use `bash unit_testing.sh` to run unit test for core modules
+# use `bash unit_testing.sh -all` to run test(include IT) for all modules
if [ $# -eq 0 ]; then
MODE='simple'
@@ -37,7 +37,7 @@ ci_output=ci-results-`date +"%Y-%m-%d"`.txt
echo "----------- Kylin Install Start <`date +"%Y-%m-%d %H:%M:%S"`>
-----------"
-mvn -U clean install -T 2C -Dmaven.compile.fork=true -DskipTests
>>${ci_output} 2>&1
+mvn -U clean install -T 2C -Dmaven.compile.fork=true -DskipTests
echo "----------- Kylin Unit Test Start <`date +"%Y-%m-%d %H:%M:%S"`>
-----------"
mvn clean test --fail-at-end -pl src/assembly -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
@@ -45,7 +45,6 @@ mvn clean test --fail-at-end -pl src/common-booter
-DfailIfNoTests=false -Duser.
mvn clean test --fail-at-end -pl src/common-server -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/common-service -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/core-common -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/core-job -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/core-metadata -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/core-metrics -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/core-storage -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
@@ -76,6 +75,7 @@ if [[ "$MODE" == "all" ]]; then
echo "----------- Kylin Integrate Test Start <`date +"%Y-%m-%d %H:%M:%S"`>
-----------"
mvn clean test --fail-at-end -pl src/datasource-sdk -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/datasource-service
-DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+ mvn clean test --fail-at-end -pl src/core-job -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/kylin-server-it -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/kylin-it -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/streaming -DfailIfNoTests=false
-Duser.timezone=GMT+8 >>${ci_output} 2>&1
@@ -88,11 +88,11 @@ fi
echo "----------- Kylin Test Completed <`date +"%Y-%m-%d
%H:%M:%S"`>-----------"
-echo "<Running test on following module>"
+echo "----------- Running test on following module ----------- "
cat ${ci_output} | grep "maven-surefire-plugin:3.0.0-M5:test"
-echo "<Failed test on following module>"
+echo "----------- Failed test on following module ----------- "
cat ${ci_output} | grep "Failed to execute goal
org.apache.maven.plugins:maven-surefire-plugin:"
-echo "<Failed cases statistics>"
+echo "----------- Failed cases statistics ----------- "
cat ${ci_output} | grep "R] Tests run"
diff --git a/pom.xml b/pom.xml
index 157768cb1f..ae79999f46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,7 +339,7 @@
<paranamer.version>2.8</paranamer.version>
<!-- JVM Args for Testing -->
- <argLine>-Xms2G -Xmx8G</argLine>
+ <argLine>-Xms4G -Xmx10G</argLine>
<!-- Apache POI -->
<poi.version>4.1.2</poi.version>
