This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new e2927d5  [IOTDB-579]Optimize travis for readability and add more 
modules for code coverage (#992)
e2927d5 is described below

commit e2927d5c8d237fedf8e0daec63cc5989b54069ae
Author: Xiangdong Huang <[email protected]>
AuthorDate: Tue Apr 7 13:34:43 2020 +0800

    [IOTDB-579]Optimize travis for readability and add more modules for code 
coverage (#992)
    
    * optimize travis to reduce unnecessary test and enhance the readability
    * make site available only when use -Pwebsite command
    * fix converalls:report command
    * use travis official openjkd11 in LinuxOS
---
 .travis.yml    | 111 ++++++++++++++-------------------------------------------
 pom.xml        |  15 +-------
 site/README.md |   8 ++++-
 3 files changed, 35 insertions(+), 99 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d3b3605..3924e33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,17 +31,6 @@ matrix:
     - os: osx
       osx_image: xcode10.1 # with JDK11.0.1+13 installed
       name: osx-oraclejdk11
-      script:
-        - rm -rf /Users/travis/.m2/repository/org/apache/maven/plugins
-        - rm -rf /Users/travis/.m2/repository/org/apache/tomcat
-        - java -version
-        - mvn -version
-        - mvn -B apache-rat:check
-        # Output something every 10 minutes or Travis kills the job
-        - while sleep 540; do echo "=====[ $SECONDS seconds still running 
]====="; done &
-        - mvn -B clean package -pl 
server,grafana,client,example,:kafka-example,:rocketmq-example -am 
integration-test
-        # Killing background sleep loop
-        - kill %1
     - os: osx
       osx_image: xcode9.3  # with JDK1.8.0_112-b16 installed
       name: osx-oraclejdk8
@@ -55,17 +44,6 @@ matrix:
             - AdoptOpenJDK/openjdk
           update: true
           casks: adoptopenjdk-openjdk11
-      script:
-        - rm -rf /Users/travis/.m2/repository/org/apache/maven/plugins
-        - rm -rf /Users/travis/.m2/repository/org/apache/tomcat
-        - java -version
-        - mvn -version
-        - mvn -B apache-rat:check
-        # Output something every 10 minutes or Travis kills the job
-        - while sleep 540; do echo "=====[ $SECONDS seconds still running 
]====="; done &
-        - mvn -B clean package -pl 
server,grafana,client,example,:kafka-example,:rocketmq-example -am 
integration-test
-        # Killing background sleep loop
-        - kill %1
     - os: osx
       osx_image: xcode9.3  # with JDK1.8.0_112-b16 installed
       name: osx-openjdk8
@@ -76,23 +54,16 @@ matrix:
             - AdoptOpenJDK/openjdk
           update: true
           casks: adoptopenjdk-openjdk8
-          #    - os: windows
-          #      language: c
-          #      name: win-oraclejdk11
-          #      install:
-          #        - choco install jdk11 -params 'installdir=c:\\java11'
-          #        - export PATH=$PATH:"/c/java11/bin"
-          #        - export JAVA_HOME="/c/java11"
-          #        - wget -q 
https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip
-          #        - /C/Progra~1/7-Zip/7z.exe x apache-maven-3.6.3-bin.zip 
-o/c/mvn363
-          #        - export "MAVEN_HOME=/c/mvn363/apache-maven-3.6.3"
-          #        - export "M2_HOME=/c/mvn363/apache-maven-3.6.3"
-          #        - export "PATH=$MAVEN_HOME/bin:$PATH"
-          #      script:
-          #        - java -version
-          #        - mvn -version
-          #        - mvn -B clean package -pl 
server,grafana,client,example,:kafka-example,:rocketmq-example -am 
integration-test
-
+    - os: linux
+      name: linux-openjdk11
+      dist: xenial
+      sudo: required
+      jdk:
+        - openjdk11
+    - os: linux
+      name: linux-openjdk8
+      dist: xenial
+      jdk: openjdk8
     - os: windows
       language: c
       name: win-openjdk11
@@ -125,7 +96,6 @@ matrix:
         - wget --no-check-certificate 
https://github.com/cdarlint/winutils/raw/master/hadoop-2.7.3/bin/winutils.pdb 
-o C:\hadoop\bin
         - wget --no-check-certificate 
https://github.com/cdarlint/winutils/raw/master/hadoop-2.7.3/bin/yarn -o 
C:\hadoop\bin
         - wget --no-check-certificate 
https://github.com/cdarlint/winutils/raw/master/hadoop-2.7.3/bin/yarn.cmd -o 
C:\hadoop\bin
-
       before_script:
         - export "JAVA_HOME=/c/java/jdk-11.0.2"
         - export "PATH=$JAVA_HOME/bin:$PATH"
@@ -140,44 +110,11 @@ matrix:
         - mvn -version
         # Output something every 10 minutes or Travis kills the job
         - while sleep 540; do echo "=====[ $SECONDS seconds still running 
]====="; done &
-        - travis_wait 40 mvn -B clean integration-test
+        # we do not build site on Win
+        # we do not build distribution for save time
+        - travis_wait 40 mvn -B clean test integration-test -pl 
'!distribution' -am
         # Killing background sleep loop
         - kill %1
-
-    - os: linux
-      name: linux-openjdk11
-      dist: xenial
-      sudo: required
-      before_install:
-        - wget 
https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz
 -O jdk11.tar.gz
-        - tar -xzf jdk11.tar.gz
-      before_script:
-        - export JAVA_HOME=$PWD/jdk-11.0.2/
-        - export PATH=$JAVA_HOME/bin:$PATH
-      script:
-        - java -version
-        # Output something every 10 minutes or Travis kills the job
-        - while sleep 540; do echo "=====[ $SECONDS seconds still running 
]====="; done &
-        - mvn -B clean package -pl 
server,grafana,client,example,:kafka-example,:rocketmq-example -am 
integration-test
-        # Killing background sleep loop
-        - kill %1
-    - os: linux
-      name: linux-openjdk8
-      dist: xenial
-      jdk: openjdk8
-#    - os: linux
-#      name: linux-oraclejdk8
-#      dist: xenial
-#      jdk: oraclejdk8
-#    - os: linux
-#      name: linux-oraclejdk11
-#      dist: trusty
-#      jdk: oraclejdk11
-#      script:
-#        - java -version
-#        - mvn -version
-#        - mvn -B apache-rat:check
-#        - mvn -B clean package -pl 
server,grafana,client,example,:kafka-example,:rocketmq-example -am 
integration-test
     - os: linux
       if: fork = false #only fork=true (i.e., the committer has permission to 
write the repo)
       name: sonar-analysis
@@ -190,7 +127,7 @@ matrix:
           token:
             secure: 
"a2n2+MFfuOb3hsrw5vjiIUZzjt6S0j4YmRVrms6NVKF+EpEAWU/zOjzfccLGRr3VFUAlkoM2p578c/0DMMGew2oj3Yl1iJe2n35BWIV6r/psUKRUMdgMAogdshQzZGMYmY1XL2xA3ATu8cf4F8WoRAafd/S58JGQdTfsQ5svh31BxK0iuh+nMIZb4dYxO717dSVD45D9hoF5ROxdtTRbyAaXFPs5djxWrdzKw0J3e6a8m82K9FGcpy4pY9ct3ttbyEzGqMnzE4fhd3KgopFJj+3QdAi/3Cmkf1voxorQdCSbktl4PtlzMY/nxF6XETI2E4T+GLUVMw4iHiXCabqwOiudGnEj5DjNz6X5MVCOyj7lrFBTlDirGzv9fNpvQ2I47WOL8DzBJPqFwQ0nRAlbvcWVtE4aAqj8YF1QwwLxEIi4abDfOwaxGG2TOixQf627pvhh1o0RdEf9R6aRyur7vbM
 [...]
       script:
-        - mvn verify sonar:sonar -Dsonar.organization=apache 
-Dsonar.projectKey=apache_incubator-iotdb -DskipTests
+        - mvn verify sonar:sonar -Dsonar.organization=apache 
-Dsonar.projectKey=apache_incubator-iotdb -DskipTests -pl '!distribution' -am
     - os: linux
       if: fork = false #only fork=true (i.e., the committer has permission to 
write the repo)
       name: code-coverage
@@ -198,9 +135,9 @@ matrix:
       jdk: openjdk8
       script:
         # now, grafana has no tests; spark-* tests are written by scala
-        - mvn post-integration-test -Pcode-coverage 
-        - mvn coveralls:report -Dservice_name=travis_ci -pl 
tsfile,jdbc,server,session,client,hadoop,hive-connector
-
+        - mvn post-integration-test -Pcode-coverage -Pcoveralls -pl 
'!site','!distribution' -am
+      after_success:
+        - mvn coveralls:report -DserviceName=travis_ci -pl 
tsfile,server,jdbc,client,session,hive-connector,flink-iotdb-connector
     - os: linux
       name: website checker
       dist: xenial
@@ -222,9 +159,15 @@ before_install: true
 install: true
 
 script:
-  - java -version
-  - ./mvnw.sh -B -ntp apache-rat:check
-  - ./mvnw.sh -B -ntp clean integration-test
-
+    - rm -rf /Users/travis/.m2/repository/org/apache/maven/plugins
+    - rm -rf /Users/travis/.m2/repository/org/apache/tomcat
+    - java -version
+    - mvn -version
+    - mvn -B apache-rat:check
+    # Output something every 10 minutes or Travis kills the job
+    - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; 
done &
+    - mvn -B clean test integration-test -pl '!site' -am
+    # Killing background sleep loop
+    - kill %1
 
 after_success:
diff --git a/pom.xml b/pom.xml
index bbf972d..1c4c80a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1211,19 +1211,6 @@
         </profile>
         <!-- upload code coverage report to coveralls.io-->
         <!-- to enable coveralls locally, you need to get the repoToken from 
https://coveralls.io/github/apache/incubator-iotdb.
-             use `mvn post-integration-test -pl hadoop  -Pcode-coverage 
-Pcoveralls -DrepoToken=TOKEN`-->
-        <profile>
-            <id>coveralls</id>
-            <modules>
-                <!-- make sure the modules are synced with profile 
code-coverage-->
-                <module>tsfile</module>
-                <module>client</module>
-                <module>session</module>
-                <module>server</module>
-                <module>jdbc</module>
-                <module>hadoop</module>
-                <module>hive-connector</module>
-            </modules>
-        </profile>
+             use `mvn post-integration-test -Pcode-coverage 
-DrepoToken=TOKEN`-->
     </profiles>
 </project>
diff --git a/site/README.md b/site/README.md
index d5a6078..e7700a5 100644
--- a/site/README.md
+++ b/site/README.md
@@ -31,7 +31,13 @@ See https://iotdb.apache.org/
 
 ## Build Setup
 
-run `mvn package -DskipTests` 
+
+run `mvn package -DskipTests` for doing the following steps automatically:
+
+- get docs from the master branch and all lagecy docs remotely.
+- download node.js and npm;
+- run `npm install` and `npm run build`
+
 
 ## How to Debug
 

Reply via email to