Reviewed-by: Luan Shengde shdluan@163.com.com
On Thu, Apr 22, 2021 at 04:45:03PM +0800, Liu Yinsi wrote:
[why] prevent to use variables value from z9 in testbox.
Signed-off-by: Liu Yinsi liuyinsi@163.com
sparrow/3-code/dev-env | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index a478fffe..ba213e3a 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -41,16 +41,16 @@ server_name=$(hostname | cut -f1 -d.) : ${git_server:=$server_ip} : ${SCHED_HTTPS_HOST:=$server_ip} : ${SCHED_HTTPS_PORT:=20002} -: ${DOCKER_PROXY_HOST:=$server_ip} +: ${docker_proxy_host:=$server_ip} : ${DOCKER_PROXY_PORT:=3128} -: ${JUMPER_HOST:=$server_ip} +: ${jumper_host:=$server_ip} : ${JUMPER_PORT:=10000} -: ${MONITOR_HOST:=$server_ip} +: ${monitor_host:=$server_ip} : ${MONITOR_PORT:=20001} : ${FETCH_MAIL_DIR:=/srv/cci/Maildir} : ${FETCH_MAIL_BOX:=.compass-ci} : ${GIT_DAEMON_HOST:=$server_ip} -: ${GIT_MIRROR_HOST:=$server_ip} +: ${git_mirror_host:=$server_ip} : ${REDIS_PORT:=6379} : ${MAILDIR:=/srv/cci/Maildir/.compass-ci} : ${SENT_MAILDIR:=/srv/cci/Maildir/.sent} @@ -122,16 +122,16 @@ DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT LOCAL_SEND_MAIL_PORT: $LOCAL_SEND_MAIL_PORT MAILDIR: /srv/cci/Maildir/.compass-ci LOCAL_ROBOT_EMAIL_ADDRESS: $LOCAL_ROBOT_EMAIL_ADDRESS -DOCKER_PROXY_HOST: $DOCKER_PROXY_HOST +DOCKER_PROXY_HOST: $docker_proxy_host DOCKER_PROXY_PORT: $DOCKER_PROXY_PORT -JUMPER_HOST: $JUMPER_HOST +JUMPER_HOST: $jumper_host JUMPER_PORT: $JUMPER_PORT -MONITOR_HOST: $MONITOR_HOST +MONITOR_HOST: $monitor_host MONITOR_PORT: $MONITOR_PORT FETCH_MAIL_DIR: $FETCH_MAIL_DIR FETCH_MAIL_BOX: $FETCH_MAIL_BOX GIT_DAEMON_HOST: $GIT_DAEMON_HOST -GIT_MIRROR_HOST: $GIT_MIRROR_HOST +GIT_MIRROR_HOST: $git_mirror_host REDIS_PORT: $REDIS_PORT MAILDIR: $MAILDIR SENT_MAILDIR: $SENT_MAILDIR -- 2.23.0