Merge pull request #600 from FISCO-BCOS/release-2.5.0

merge release 2.5.0 into master

.ci/ci_check.sh

@@ -2,15 +2,68 @@
 
 set -e
 
-curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/dev/tools/build_chain.sh && chmod u+x build_chain.sh
-bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/dev/tools/ci/download_bin.sh) -b dev -m
+java -version
+
+# code format check
+bash gradlew verifyGoogleJavaFormat
+# build
+bash gradlew build
+# UT test
+bash gradlew test
+
+curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/build_chain.sh && chmod u+x build_chain.sh
+curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/ci/download_bin.sh | bash -s -- -m -b master
 echo "127.0.0.1:4 agency1 1,2,3" > ipconf
-./build_chain.sh -e bin/fisco-bcos -f ipconf -p 30300,20200,8545 -v 2.1.0
-./nodes/127.0.0.1/start_all.sh
+
+# bash build_chain.sh -h
+# Non SM node test
+echo " NonSM ============>>>> "
+echo " NonSM ============>>>> "
+echo " NonSM ============>>>> "
+
+bash build_chain.sh -e bin/fisco-bcos -f ipconf -p 30300,20200,8545
+bash nodes/127.0.0.1/start_all.sh
 ./nodes/127.0.0.1/fisco-bcos -v
+
+mkdir -p src/integration-test/resources/
 cp nodes/127.0.0.1/sdk/* src/integration-test/resources/
-mv src/integration-test/resources/applicationContext-sample.xml src/integration-test/resources/applicationContext.xml
-./gradlew verifyGoogleJavaFormat
-./gradlew build
-./gradlew test
-./gradlew integrationTest
+cp src/test/resources/applicationContext-sample.xml src/integration-test/resources/applicationContext.xml
+cp src/test/resources/log4j.properties src/integration-test/resources/
+bash gradlew integrationTest
+
+# clean
+bash nodes/127.0.0.1/stop_all.sh
+bash nodes/127.0.0.1/stop_all.sh
+bash nodes/127.0.0.1/stop_all.sh
+rm -rf nodes
+
+# SM node test
+echo " SM NonSM SSL connection test ============>>>> "
+echo " SM NonSM SSL connection test ============>>>> "
+echo " SM NonSM SSL connection test ============>>>> "
+bash build_chain.sh -e bin/fisco-bcos -g -f ipconf -p 30300,20200,8545
+bash nodes/127.0.0.1/start_all.sh
+cp -r nodes/127.0.0.1/sdk/* src/integration-test/resources/
+cp src/test/resources/applicationContext-sample.xml src/integration-test/resources/applicationContext.xml
+sed -i.bak 's/"0"/"1"/g' src/integration-test/resources/applicationContext.xml
+cp src/test/resources/log4j.properties src/integration-test/resources/
+bash gradlew integrationTest
+
+# clean
+bash nodes/127.0.0.1/stop_all.sh
+bash nodes/127.0.0.1/stop_all.sh
+bash nodes/127.0.0.1/stop_all.sh
+rm -rf nodes
+
+## SM SSL connection test
+echo " SM SSL connection test ============>>>> "
+echo " SM SSL connection test ============>>>> "
+echo " SM SSL connection test ============>>>> "
+bash build_chain.sh -e bin/fisco-bcos -g -G -f ipconf -p 30300,20200,8545
+bash nodes/127.0.0.1/start_all.sh
+mkdir -p src/integration-test/resources/
+cp -r nodes/127.0.0.1/sdk/gm/* src/integration-test/resources/
+cp src/test/resources/applicationContext-sample.xml src/integration-test/resources/applicationContext.xml
+sed -i.bak 's/"0"/"1"/g' src/integration-test/resources/applicationContext.xml
+cp src/test/resources/log4j.properties src/integration-test/resources/
+bash gradlew integrationTest

.travis.yml

@@ -1,50 +1,71 @@
-# safelist
+# safe list
 branches:
   only:
-      - /.*/
+    - /.*/
 
-matrix:
+jobs:
   fast_finish: true
   include:
-    - language: python
-      python: 3.6
-      dist: xenial
-      before_cache:
-      cache:
-      before_install:
-      script: |
-        bash .ci/ci_check_commit.sh
+    #    - language: python
+    #      python: 3.6
+    #      dist: bionic
+    #      before_cache:
+    #      cache:
+    #      before_install:
+    #      script: |
+    #        bash .ci/ci_check_commit.sh
 
+    # ubuntu 16
     - language: java
       jdk: openjdk8
       os: linux
       dist: xenial
       sudo: required
 
+    # ubuntu 16
     - language: java
-      jdk: openjdk9
+      jdk: openjdk11
       os: linux
       dist: xenial
       sudo: required
 
+    # ubuntu 16
     - language: java
-      jdk: openjdk10
+      jdk: oraclejdk11
       os: linux
       dist: xenial
       sudo: required
 
+    # ubuntu 18
+    - language: java
+      jdk: openjdk8
+      os: linux
+      dist: bionic
+      sudo: required
+
+    # ubuntu 18
     - language: java
       jdk: openjdk11
       os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
 
-    # - language: java
-    #   jdk: openjdk11
-    #   os: osx
-    #   before_install:
-    #     - brew install gradle && gradle wrapper
+    # ubuntu 18
+    - language: java
+      jdk: oraclejdk11
+      os: linux
+      dist: bionic
+      sudo: required
 
+#    # os
+#    - language: java
+#        os: osx
+#        osx_image: xcode11.3
+addons:
+  apt:
+    packages:
+      - openssl
+      - libssl-dev
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/