Commit 0fbae93c authored by 孟维甫's avatar 孟维甫

Merge branch 'feature_mwf_azkaban' into 'test'

Feature mwf azkaban

See merge request bp/goods!21
parents e6d13874 86559f13
...@@ -5,7 +5,6 @@ application.bootstrap = APPLICATION_PATH"/application/Boot ...@@ -5,7 +5,6 @@ application.bootstrap = APPLICATION_PATH"/application/Boot
application.dispatcher.catchException = false application.dispatcher.catchException = false
application.dispatcher.throwException = false application.dispatcher.throwException = false
daemon.script_dir = "\\Daemon\\" daemon.script_dir = "\\Daemon\\"
job.script_dir = "\\Job\\"
appid = "goods" appid = "goods"
idgen.partner = "bp" idgen.partner = "bp"
......
type=command
command=bash docker run --rm -e LANG=en_US.UTF-8 -e TZ=Asia/Shanghai --net=bridge -h "`hostname`" --cap-add SYS_PTRACE --privileged docker2.yidian.com:5000/publish/bp-goods-azkaban-test-4-image /bin/bash -c "cd /home/services && sh start_job.sh test goodstoes index a=3&b=4"
...@@ -49,8 +49,13 @@ sysctl -w net.core.somaxconn=65535 ...@@ -49,8 +49,13 @@ sysctl -w net.core.somaxconn=65535
php api.go2yd.com/htdocs/Website/public/job.php "$2" "$3" "$4" php api.go2yd.com/htdocs/Website/public/job.php "$2" "$3" "$4"
if [ $? -ne 0 ] ret=$?
then
# todo if [ $ret -ne 0 ]; then
echo "Build failed" echo "Build failed"
exit $ret
else
echo "Build success"
fi fi
exit 0
\ No newline at end of file
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