Commit 59f852a0 authored by mdj33's avatar mdj33 Committed by vipwzw

move testcase=all to jenkins

parent 075a66c1
...@@ -26,6 +26,13 @@ jobs: ...@@ -26,6 +26,13 @@ jobs:
script: script:
- make test - make test
- stage: auto-test
go: "1.9.x"
install: skip
before_script: make build_ci
script:
- make autotest dapp=all
- stage: coverage - stage: coverage
if: branch = master if: branch = master
go: "1.9.x" go: "1.9.x"
...@@ -39,6 +46,7 @@ jobs: ...@@ -39,6 +46,7 @@ jobs:
- stage: deploy - stage: deploy
if: env(DAPP) IS present
sudo: required sudo: required
services: services:
- docker - docker
...@@ -55,6 +63,4 @@ jobs: ...@@ -55,6 +63,4 @@ jobs:
- sudo mv docker-compose /usr/local/bin - sudo mv docker-compose /usr/local/bin
before_script: make build_ci before_script: make build_ci
script: script:
- make autotest_ci proj=build - make docker-compose DAPP=${DAPP} && make docker-compose-down DAPP=${DAPP} && make clean
# - make docker-compose && make docker-compose-down && make docker-compose DAPP=paracross && make docker-compose-down DAPP=paracross && make docker-compose DAPP=relay && make docker-compose-down DAPP=relay
- make docker-compose DAPP=all && make docker-compose-down DAPP=all && make clean
...@@ -28,6 +28,24 @@ pipeline { ...@@ -28,6 +28,24 @@ pipeline {
} }
} }
stage('deploy') {
steps {
dir("${PROJ_DIR}"){
gitlabCommitStatus(name: 'deploy'){
sh 'make build_ci'
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 "
}
}
}
post {
always {
dir("${PROJ_DIR}"){
sh "cd build/${env.BUILD_NUMBER} && ./docker-compose-pre.sh down ${env.BUILD_NUMBER} all && cd .. && rm -rf ${env.BUILD_NUMBER} && cd .. && make clean "
}
}
}
}
} }
post { post {
......
...@@ -70,3 +70,10 @@ make push b=branch_dev_name m="hello world" ...@@ -70,3 +70,10 @@ make push b=branch_dev_name m="hello world"
``` ```
如果m不设置,那么不会执行 git commit 的命令 如果m不设置,那么不会执行 git commit 的命令
#### 测试代码
类似plugin/dapp/relay,在cmd目录下编写自己插件的Makefile和build.sh
在build目录下写testcase和相关的Dockerfile和docker-compose配置文件,
testcase的规则参考plugin/dapp/testcase_compose_rule.md
用户可以在travis自己工程里面设置自己plugin的DAPP变量,如DAPP设置为relay,则travis里面run relay的testcase
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment