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

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new fef7803  KYLIN-4864 Fix .travis.yml syntax (#1700)
fef7803 is described below

commit fef7803567405cb488c745a86a880bbf2a30f83f
Author: Martin Grigorov <marti...@users.noreply.github.com>
AuthorDate: Mon Aug 2 11:47:48 2021 +0300

    KYLIN-4864 Fix .travis.yml syntax (#1700)
    
    * KYLIN-4864 Fix .travis.yml syntax
    
    The commented line about `# mvn sonar:sonar -e 
-Dsonar.host.url=https://sonarcloud.io ...` has broken the YAML and because of 
this TravisCI didn't execute any jobs.
    I wasn't able to find a way to preserve the commented line and fix the 
syntax, so I removed the line. Later it could be get from Git history to 
re-enable Sonar.
    
    While here I've improved few more things:
    - install OpenJDK and unzip for both AMD64 and ARM64. This way it uses 
latest JDK 8 (1.8.0_292) for both CPU architectures
    - fix more YAML warnings
    
    * KYLIN-4864 Use Graviton2 ARM64 node
    
    There is some problem with resolving the local address on the arm64 node 
(non-graviton2) - https://travis-ci.community/t/sudo-unable-to-resolve-host/8841
---
 .travis.yml | 52 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2e12180..4870258 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-language: java
+---
+language: generic
 
 addons:
+  apt:
+    packages: 
+      - openjdk-8-jdk
+      - unzip
   sonarcloud:
     organization: "kylin"
     token:
@@ -27,35 +32,37 @@ cache:
   directories:
     - $HOME/.m2
 
-matrix:
+jobs:
   include:
-    - arch: arm64
-      addons:
-        apt:
-          packages: openjdk-8-jdk
-    - arch: amd64
-      jdk: openjdk8
-
+    - name: Linux ARM64
+      arch: arm64-graviton2
+      dist: focal
+      virt: vm
+      group: edge
+    - name: Linux x86
+      arch: amd64
+      
 before_install:
-  - echo "Downloading Maven 3.5.3"
-      && wget 
https://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.zip
-      && unzip -qq apache-maven-3.5.3-bin.zip
-      && export M2_HOME=$PWD/apache-maven-3.5.3
-      && export PATH=$M2_HOME/bin:$PATH
-      && mvn -version
+  - export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-${TRAVIS_CPU_ARCH}";
+  - export PATH="$JAVA_HOME/bin:$PATH";
+  - echo "Downloading Maven 3.8.1"
+  - wget --quiet 
https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.zip
+  - unzip -qq -o apache-maven-3.8.1-bin.zip
+  - export M2_HOME=$PWD/apache-maven-3.8.1
+  - export PATH=$M2_HOME/bin:$PATH
+  - mvn -version
   - echo "MAVEN_OPTS='-Xms1024m -Xmx3072m -XX:MetaspaceSize=128m 
-XX:MaxMetaspaceSize=384m'" > ~/.mavenrc
   - sed -i 
's/log4j.logger.org.apache.kylin=INFO/log4j.logger.org.apache.kylin=WARN/g' 
build/conf/kylin-server-log4j.properties
   - sed -i 
's/log4j.logger.org.apache.kylin=INFO/log4j.logger.org.apache.kylin=WARN/g' 
build/conf/kylin-tools-log4j.properties
-  - if [[ $(uname -m) == 'aarch64' ]];then export 
JAVA_HOME="/usr/lib/jvm/java-8-openjdk-arm64";fi
 
 script:
-  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test 
coveralls:report -e
-  - if [[ -n "${TRAVIS_PULL_REQUEST_SLUG}" && "${TRAVIS_PULL_REQUEST_SLUG}" != 
"${TRAVIS_REPO_SLUG}" ]]; then
+  - mvn --no-transfer-progress clean 
org.jacoco:jacoco-maven-plugin:prepare-agent test coveralls:report -e
+  - if [[ -n "${TRAVIS_PULL_REQUEST_SLUG}" && "${TRAVIS_PULL_REQUEST_SLUG}" != 
"${TRAVIS_REPO_SLUG}" ]]; 
+    then
         echo "The pull request from ${TRAVIS_PULL_REQUEST_SLUG} is an EXTERNAL 
pull request. Skip sonar analysis.";
     else
         git fetch --unshallow --quiet;
-        echo "Skip sonar temporarily because sonarcloud require jdk11"
-        # mvn sonar:sonar -e -Dsonar.host.url=https://sonarcloud.io 
-Dsonar.login=2ca24e5a04ad1fca4ca956953810421aa8bd1470 
-Dsonar.organization=kylin;
+        echo "Skip sonar temporarily because sonarcloud requires jdk11. To 
re-enable see Git history!";
     fi
 
 notification:
@@ -66,7 +73,7 @@ notification:
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-  
+
 before_cache:
   # Remove project's local artifacts to force maven reactor resolve
   - rm -rf $HOME/.m2/repository/org/apache/kylin
@@ -74,4 +81,5 @@ before_cache:
 # blocklist
 branches:
   except:
-  - document
+    - document
+

Reply via email to