Commit 9a148465 authored by QM's avatar QM Committed by 33cn

modify Jenkinsfile

parent 05309be1
...@@ -24,7 +24,7 @@ pipeline { ...@@ -24,7 +24,7 @@ pipeline {
gitlabCommitStatus(name: 'deploy'){ gitlabCommitStatus(name: 'deploy'){
sh 'go version' sh 'go version'
sh 'make build_ci' sh 'make build_ci'
sh "cd build && mkdir ${env.BUILD_NUMBER} && cp ci/* ${env.BUILD_NUMBER} -r && ./docker-compose-pre.sh modify && cp chain33* Dockerfile* docker* *.sh ${env.BUILD_NUMBER}/ && cd ${env.BUILD_NUMBER}/ && ./docker-compose-pre.sh run ${env.BUILD_NUMBER} all " sh "cd build && mkdir ${env.BUILD_NUMBER} && cp ci/* ${env.BUILD_NUMBER} -r && ./docker-compose-pre.sh modify && cp chain33* Dockerfile* docker* *.sh ${env.BUILD_NUMBER}/ && cd ${env.BUILD_NUMBER}/ && rm -rf cross2eth && ./docker-compose-pre.sh run ${env.BUILD_NUMBER} all "
} }
} }
} }
......
...@@ -100,7 +100,7 @@ function main() { ...@@ -100,7 +100,7 @@ function main() {
echo "============ run main end =================" echo "============ run main end ================="
find . -maxdepth 1 -type d -name "*-ci" -exec rm -rf {} \; find . -maxdepth 1 -type d -name "*-ci" -exec rm -rf {} \;
dir=$(find . -maxdepth 1 -type d ! -name system ! -name . | sed 's/^\.\///') dir=$(find . -maxdepth 1 -type d ! -name system ! -name . ! -name cross2eth | sed 's/^\.\///')
for app in $dir; do for app in $dir; do
run_single_app "${app}" "$TESTCASEFILE" "down" run_single_app "${app}" "$TESTCASEFILE" "down"
done done
...@@ -111,7 +111,7 @@ function main() { ...@@ -111,7 +111,7 @@ function main() {
fi fi
elif [ "${OP}" == "down" ]; then elif [ "${OP}" == "down" ]; then
if [ "${DAPP}" == "all" ] || [ "${DAPP}" == "ALL" ]; then if [ "${DAPP}" == "all" ] || [ "${DAPP}" == "ALL" ]; then
dir=$(find . -maxdepth 1 -type d ! -name system ! -name . | sed 's/^\.\///') dir=$(find . -maxdepth 1 -type d ! -name system ! -name . ! -name cross2eth | sed 's/^\.\///')
for app in $dir; do for app in $dir; do
down_dapp "${app}" down_dapp "${app}"
done done
......
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