merge gitlab branch

Former-commit-id: a515d8150309d7d99e09dbfab9c378582f6611dd
Former-commit-id: 815719c

Author: bysomeone

.gitignore

@@ -3,7 +3,6 @@ datadir*
 *.exe
 *.orig
 *.bak
-*.log.last
 .idea
 .vscode
 cmd/chain33/chain33
@@ -24,10 +23,10 @@ build/ci
 cmd/execblock/execblock
 cmd/miner_accounts/miner_accounts
 cmd/write/write
-build/tools/autotest/autotest
-build/tools/autotest/*.toml
-build/tools/autotest/chain33
-build/tools/autotest/chain33-cli
+build/autotest/autotest
+build/autotest/local/*.toml
+build/autotest/local/autotest*
+build/autotest/local/chain33*
 plugin/consensus/raft/chain33_raft-1/
 common/mavl/datastore
 .DS_Store

.gitlab-ci.yml

@@ -193,7 +193,7 @@ autotest:
         - if [ -n "${onceEveryday}" ]; then
         - make build_ci
         - make autotest
-        - cd build/tools/autotest && ./run-autotest.sh build
+        - cd build/autotest && ./copy-autotest.sh gitlabci && cd gitlabci && ./gitlabci-autotest.sh build
         - cd $GO_PROJECT_PATH
         - fi
     when: always

Jenkinsfile

@@ -67,6 +67,7 @@ pipeline {
                 dir("${PROJ_DIR}"){
                     gitlabCommitStatus(name: 'deploy'){
                         sh 'make build_ci'
+                        sh "make autotest_ci proj=${env.BUILD_NUMBER}"
                         sh "cd build && mkdir ${env.BUILD_NUMBER} && cp ci/* ${env.BUILD_NUMBER} -r && cp chain33* Dockerfile* docker* *.sh ${env.BUILD_NUMBER}/ && cd ${env.BUILD_NUMBER}/ && ./docker-compose-pre.sh run ${env.BUILD_NUMBER} all "
                     }
                 }

Makefile

@@ -14,7 +14,7 @@ APP := build/chain33
 CLI := build/chain33-cli
 SIGNATORY := build/signatory-server
 MINER := build/miner_accounts
-AUTO_TEST := build/tools/autotest/autotest
+AUTO_TEST := build/autotest/autotest
 SRC_AUTO_TEST := github.com/33cn/chain33/cmd/autotest
 LDFLAGS := -ldflags "-w -s"
 PKG_LIST := `go list ./... | grep -v "vendor" | grep -v "chain33/test" | grep -v "mocks" | grep -v "pbft"`
@@ -68,10 +68,11 @@ para:
 
 autotest:## build autotest binary
 	@go build -v -i -o $(AUTO_TEST) $(SRC_AUTO_TEST)
-	@cp cmd/autotest/*.toml build/tools/autotest/
 	@if [ -n "$(dapp)" ]; then \
-		cd build/tools/autotest && bash ./local-autotest.sh $(dapp) && cd ../../../; \
+		cd build/autotest && bash ./copy-autotest.sh local && cd local && bash ./local-autotest.sh $(dapp) && cd ../../../; \
 	fi
+autotest_ci: autotest ## autotest jerkins ci
+	@cd build/autotest && bash ./copy-autotest.sh jerkinsci/temp$(proj) && cd jerkinsci && bash ./jerkins-ci-autotest.sh $(proj) && cd ../../../
 
 signatory:
 	@cd cmd/signatory-server/signatory && bash ./create_protobuf.sh && cd ../.../..
@@ -174,7 +175,7 @@ clean: ## Remove previous build
 	@rm -rf build/relayd*
 	@rm -rf build/*.log
 	@rm -rf build/logs
-	@rm -rf build/tools/autotest/autotest
+	@rm -rf build/autotest/autotest
 	@rm -rf build/ci
 	@go clean
 

build/autotest/copy-autotest.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+#set -o verbose
+#set -o xtrace
+
+# os: ubuntu16.04 x64
+
+#chain33 dapp autotest root directory
+declare -a Chain33AutoTestDirs=("system" "plugin")
+
+#copy auto test to specific directory
+# check args
+if [ "$#" -lt 1 ]; then
+    echo "Usage: $0 directory list"
+    exit 1
+fi
+
+function copyAutoTestConfig() {
+
+    echo "#copy auto test config to path \"$1\""
+    local AutoTestConfigFile="$1/autotest.toml"
+
+    #pre config auto test
+    {
+
+        echo 'cliCmd="./chain33-cli"'
+        echo "checkTimeout=60"
+    } >"${AutoTestConfigFile}"
+
+    #copy all the dapp test case config file
+    for rootDir in "${Chain33AutoTestDirs[@]}"; do
+
+        testDirArr=$(find ../../"${rootDir}" -type d -name autotest)
+
+        for autotest in ${testDirArr}; do
+
+            dapp=$(basename "$(dirname "${autotest}")")
+            dappConfig=${autotest}/${dapp}.toml
+
+            #make sure dapp have auto test config
+            if [ -e "${dappConfig}" ]; then
+
+                cp "${dappConfig}" "$1"/
+
+                #add dapp test case config
+                {
+                    echo "[[TestCaseFile]]"
+                    echo "dapp=\"$dapp\""
+                    echo "filename=\"$dapp.toml\""
+                } >>"${AutoTestConfigFile}"
+
+            fi
+
+        done
+    done
+}
+
+function copyChain33() {
+
+    echo "# copy chain33 bin to path \"$1\""
+    cp ../chain33 ../chain33-cli ../chain33.toml ../../cmd/chain33/chain33.test.toml "$1"
+
+}
+
+for dir in "$@"; do
+
+    #check dir exist
+    if [ ! -d "${dir}" ]; then
+        mkdir "${dir}"
+    fi
+    cp autotest "${dir}"
+    copyAutoTestConfig "${dir}"
+    copyChain33 "${dir}"
+    echo  "# all copy have done!"
+
+done

build/tools/autotest/Dockerfile-autotest build/autotest/gitlabci/Dockerfile-autotest

@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-  chain33:
+  autotest:
     build:
       context: .
       dockerfile: Dockerfile-autotest

build/tools/autotest/compose-autotest.yml build/autotest/gitlabci/compose-autotest.yml

@@ -30,9 +30,6 @@ fi
 
 function init() {
     # update test environment
-    cp ../../chain33.toml ./
-    cp ../../chain33 ./
-    cp ../../chain33-cli ./
     sed -i $sedfix 's/^Title.*/Title="local"/g' chain33.toml
     sed -i $sedfix 's/^TestNet=.*/TestNet=true/g' chain33.toml
 
@@ -62,7 +59,7 @@ function start() {
     # create and run docker-compose container
     docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
 
-    local SLEEP=60
+    local SLEEP=30
     echo "=========== sleep ${SLEEP}s ============="
     sleep ${SLEEP}
 
@@ -117,27 +114,6 @@ function start() {
         exit 1
     fi
 
-    echo "=========== # import test addr1 ============="
-    result=$(${CLI} account import_key -k 0x88b2fb90411935872f0501dd13345aba19b5fac9b00eb0dddd7df977d4d5477e -l test_addr1 | jq ".label")
-    echo "${result}"
-    if [ -z "${result}" ]; then
-        exit 1
-    fi
-
-    echo "=========== # import test addr2 ============="
-    result=$(${CLI} account import_key -k 0xa0c6f46de8d275ce21e935afa5363e9b8a087fe604e05f7a9eef1258dc781c3a -l test_addr2 | jq ".label")
-    echo "${result}"
-    if [ -z "${result}" ]; then
-        exit 1
-    fi
-
-    echo "=========== # import test addr3 ============="
-    result=$(${CLI} account import_key -k 0x9d4f8ab11361be596468b265cb66946c87873d4a119713fd0c3d8302eae0a8e4 -l test_addr3 | jq ".label")
-    echo "${result}"
-    if [ -z "${result}" ]; then
-        exit 1
-    fi
-
     echo "=========== # close auto mining ============="
     result=$(${CLI} wallet auto_mine -f 0 | jq ".isok")
     if [ "${result}" = "false" ]; then
@@ -247,19 +223,21 @@ function auto_test() {
     docker exec "${NODE3}" /root/autotest
 }
 
-function stop() {
+function stop_chain33() {
 
+    rv=$?
     echo "=========== #stop docker-compose ============="
-    docker cp "${NODE3}":/root/autotest.log ./
-    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml down && rm ./chain33* && rm ./*.toml
+    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml down && rm -rf ./chain33* ./*.toml ./autotest
+    echo "=========== #remove related images ============"
+    docker rmi "${PROJECT_NAME}"_autotest || true
+    exit ${rv}
 }
 
 function main() {
     echo "==========================================main begin========================================================"
     init
     start
     auto_test
-    stop
     echo "==========================================main end========================================================="
 }
 
@@ -268,5 +246,9 @@ if [ "$#" -ne 1 ]; then
     echo "Suggest Usage: $0 build"
     exit 1
 fi
+
+#trap exit
+trap "stop_chain33" INT TERM EXIT
+
 # run script
 main

build/tools/autotest/run-autotest.sh build/autotest/gitlabci/gitlab-ci-autotest.sh

@@ -0,0 +1,9 @@
+FROM ubuntu:16.04
+
+WORKDIR /root
+COPY chain33 ./
+COPY chain33-cli ./
+COPY autotest ./
+COPY *.toml ./
+
+CMD ["/root/chain33", "-f" , "chain33.test.toml"]

build/autotest/jerkinsci/Dockerfile-autotest

@@ -0,0 +1,9 @@
+version: '3'
+
+services:
+  autotest:
+    build:
+      context: .
+      dockerfile: Dockerfile-autotest
+
+