Commit aa26f9c4 authored by harrylee's avatar harrylee Committed by vipwzw

update makefile

parent 3faf2dca
...@@ -46,21 +46,18 @@ vet: ...@@ -46,21 +46,18 @@ vet:
autotest: ## build autotest binary autotest: ## build autotest binary
@cd build/autotest && bash ./build.sh ${CHAIN33_PATH} && cd ../../ @cd build/autotest && bash ./build.sh ${CHAIN33_PATH} && cd ../../
@if [ -n "$(dapp)" ]; then \ @if [ -n "$(dapp)" ]; then \
chmod -R 755 build/autotest/local \ rm -rf build/autotest/local \
&& rm -rf build/autotest/local \
&& cp -r $(CHAIN33_PATH)/build/autotest/local $(CHAIN33_PATH)/build/autotest/*.sh build/autotest \ && cp -r $(CHAIN33_PATH)/build/autotest/local $(CHAIN33_PATH)/build/autotest/*.sh build/autotest \
&& cd build/autotest && chmod -R 755 local && chmod 755 *.sh && bash ./copy-autotest.sh local \ && cd build/autotest && chmod -R 755 local && chmod 755 *.sh && bash ./copy-autotest.sh local \
&& cd local && bash ./local-autotest.sh $(dapp) \ && cd local && bash ./local-autotest.sh $(dapp) \
&& cd ../../../; fi && cd ../../../; fi
autotest_ci: autotest ## autotest ci autotest_ci: autotest ## autotest ci
@chmod -R 755 build/autotest/jerkinsci \ @rm -rf build/autotest/jerkinsci \
&& rm -rf build/autotest/jerkinsci \
&& cp -r $(CHAIN33_PATH)/build/autotest/jerkinsci $(CHAIN33_PATH)/build/autotest/*.sh build/autotest/ \ && cp -r $(CHAIN33_PATH)/build/autotest/jerkinsci $(CHAIN33_PATH)/build/autotest/*.sh build/autotest/ \
cd build/autotest &&chmod -R 755 jerkinsci && chmod 755 *.sh && bash ./copy-autotest.sh jerkinsci/temp$(proj) \ cd build/autotest &&chmod -R 755 jerkinsci && chmod 755 *.sh && bash ./copy-autotest.sh jerkinsci/temp$(proj) \
&& cd jerkinsci && bash ./jerkins-ci-autotest.sh $(proj) && cd ../../../ && cd jerkinsci && bash ./jerkins-ci-autotest.sh $(proj) && cd ../../../
autotest_tick: autotest ## run with ticket mining autotest_tick: autotest ## run with ticket mining
@chmod -R 755 build/autotest/gitlabci \ @rm -rf build/autotest/gitlabci \
&& rm -rf build/autotest/gitlabci \
&& cp -r $(CHAIN33_PATH)/build/autotest/gitlabci $(CHAIN33_PATH)/build/autotest/*.sh build/autotest/ \ && cp -r $(CHAIN33_PATH)/build/autotest/gitlabci $(CHAIN33_PATH)/build/autotest/*.sh build/autotest/ \
&& cd build/autotest &&chmod -R 755 gitlabci && chmod 755 *.sh && bash ./copy-autotest.sh gitlabci \ && cd build/autotest &&chmod -R 755 gitlabci && chmod 755 *.sh && bash ./copy-autotest.sh gitlabci \
&& cd gitlabci && bash ./gitlab-ci-autotest.sh build && cd ../../../ && cd gitlabci && bash ./gitlab-ci-autotest.sh build && cd ../../../
......
...@@ -61,10 +61,10 @@ GetUserNamePasswdAndPath() { ...@@ -61,10 +61,10 @@ GetUserNamePasswdAndPath() {
remote_dir=$(echo "${destInfo}" | awk -F ' ' '{print $3}') remote_dir=$(echo "${destInfo}" | awk -F ' ' '{print $3}')
echo 'Please input ip list of your destination: (such as "192.168.3.143 192.168.3.144 192.168.3.145 192.168.3.146")' echo 'Please input ip list of your destination: (such as "192.168.3.143 192.168.3.144 192.168.3.145 192.168.3.146")'
read iplist read -a iplist
index=0 index=0
CreateNewConfigFile CreateNewConfigFile
for ip in "${iplist}"; do for ip in "${iplist[@]}"; do
index=$((index + 1)) index=$((index + 1))
{ {
echo "[servers.${index}]" echo "[servers.${index}]"
......
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