kibana: 11309 to 20000 monitoring: 11310 to 20001 scheduler-https: 11306 to 20002 sshr: 50000-51999 to 21000-23999
Signed-off-by: Wu Zhende wuzhende666@163.com --- container/kibana/start | 2 +- container/monitoring/build | 2 +- container/monitoring/start | 2 +- container/scheduler-https/start | 4 ++-- container/ssh-r/Dockerfile | 2 +- container/ssh-r/start | 2 +- doc/manual/submit-job.en.md | 4 ++-- doc/manual/submit-job.zh.md | 4 ++-- src/delimiter/constants.rb | 2 +- src/monitoring/constants.cr | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/container/kibana/start b/container/kibana/start index dbb3c56..26a4944 100755 --- a/container/kibana/start +++ b/container/kibana/start @@ -24,7 +24,7 @@ cmd = %W[ -v /etc/localtime:/etc/localtime:ro -d -e ELASTICSEARCH_HOSTS=http://#%7BLOGGING_ES_HOST%7D:#%7BLOGGING_ES_PORT%7D - -p 11309:5601 + -p 20000:5601 kibana:7.6.2 ]
diff --git a/container/monitoring/build b/container/monitoring/build index 121ede0..4865c70 100755 --- a/container/monitoring/build +++ b/container/monitoring/build @@ -9,7 +9,7 @@ require_relative '../defconfig.rb' names = Set.new ['MONITOR_PORT'] defaults = relevant_defaults(names)
-MONITOR_PORT = (defaults['MONITOR_PORT'] || '11310') +MONITOR_PORT = (defaults['MONITOR_PORT'] || '20001')
docker_skip_rebuild "monitoring-#{MONITOR_PORT}"
diff --git a/container/monitoring/start b/container/monitoring/start index 2e2946c..f4214ed 100755 --- a/container/monitoring/start +++ b/container/monitoring/start @@ -17,7 +17,7 @@ env = docker_env(defaults)
DEFAULT_CCI = '/c/cci' DEFAULT_LKP = '/c/lkp-tests' -MONITOR_PORT = defaults['MONITOR_PORT'] || '11310' +MONITOR_PORT = defaults['MONITOR_PORT'] || '20001' docker_rm "monitoring-#{MONITOR_PORT}"
cmd = %W[ diff --git a/container/scheduler-https/start b/container/scheduler-https/start index 98940d7..ee93e79 100755 --- a/container/scheduler-https/start +++ b/container/scheduler-https/start @@ -39,12 +39,12 @@ names = Set.new %w[
defaults = relevant_defaults(names) defaults['SSHR_PORT'] ||= 5050 -defaults['SSHR_PORT_BASE'] ||= 50000 +defaults['SSHR_PORT_BASE'] ||= 21000 defaults['SSHR_PORT_LEN'] ||= 2000 defaults['SCHED_PORT'] ||= '3000' defaults['SCHED_HOST'] ||= '172.17.0.1' defaults['MASTER_FLUENTD_PORT'] ||= '24224' -defaults['SCHED_HTTPS_PORT'] ||= 11306 +defaults['SCHED_HTTPS_PORT'] ||= 20002 defaults['SCHED_HTTPS_HOST'] ||= 'api.compass-ci.openeuler.org' env = docker_env(defaults)
diff --git a/container/ssh-r/Dockerfile b/container/ssh-r/Dockerfile index 65a13aa..416e0ef 100644 --- a/container/ssh-r/Dockerfile +++ b/container/ssh-r/Dockerfile @@ -21,7 +21,7 @@ RUN chown -R sshr:sshr /home/sshr/.ssh/authorized_keys \ && chmod 600 /home/sshr/.ssh/authorized_keys \ && passwd -u sshr
-EXPOSE 50000-51999 +EXPOSE 21000-23999 EXPOSE 22
COPY entry.sh /entry.sh diff --git a/container/ssh-r/start b/container/ssh-r/start index 5c800f3..6c7a373 100755 --- a/container/ssh-r/start +++ b/container/ssh-r/start @@ -15,7 +15,7 @@ cmd=( -e GATEWAY_PORTS=true -e TCP_FORWARDING=true -d - -p 50000-51999:50000-51999 + -p 21000-23999:21000-23999 -p 5050:22 -v /etc/localtime:/etc/localtime:ro -v /srv/pub/sshr/keys/:/etc/ssh/keys diff --git a/doc/manual/submit-job.en.md b/doc/manual/submit-job.en.md index de73f8f..5106bd9 100644 --- a/doc/manual/submit-job.en.md +++ b/doc/manual/submit-job.en.md @@ -141,7 +141,7 @@ options: hi8109@account-vm ~% submit -m iperf.yaml submit iperf.yaml, got job_id=z9.173923 query=>{"job_id":["z9.173923"]} - connect to ws://172.168.131.2:11310/filter + connect to ws://172.168.131.2:20001/filter {"job_id":"z9.173923","message":"","job_state":"submit","result_root":"/srv/result/iperf/2020-11-30/vm-2p8g/openeuler-20.03-aarch6 {"job_id": "z9.173923", "result_root": "/srv/result/iperf/2020-11-30/vm-2p8g/openeuler-20.03-aarch64/tcp-30/z9.173923", "job_state {"job_id": "z9.173923", "job_state": "boot"} @@ -175,7 +175,7 @@ options: hi8109@account-vm ~% submit -m -c borrow-1h.yaml submit borrow-1h.yaml, got job_id=z9.173925 query=>{"job_id":["z9.173925"]} - connect to ws://172.168.131.2:11310/filter + connect to ws://172.168.131.2:20001/filter {"job_id":"z9.173925","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-30/vm-2p8g/openeuler-20.03-aarch {"job_id": "z9.173925", "result_root": "/srv/result/borrow/2020-11-30/vm-2p8g/openeuler-20.03-aarch64/3600/z9.173925", "job_state" {"job_id": "z9.173925", "job_state": "boot"} diff --git a/doc/manual/submit-job.zh.md b/doc/manual/submit-job.zh.md index 77e9566..5f1838b 100644 --- a/doc/manual/submit-job.zh.md +++ b/doc/manual/submit-job.zh.md @@ -140,7 +140,7 @@ options: hi8109@account-vm ~% submit -m iperf.yaml testbox=vm-2p8g submit iperf.yaml, got job_id=z9.173923 query=>{"job_id":["z9.173923"]} - connect to ws://172.168.131.2:11310/filter + connect to ws://172.168.131.2:20001/filter {"job_id":"z9.173923","message":"","job_state":"submit","result_root":"/srv/result/iperf/2020-11-30/vm-2p8g/openeuler-20.03-aarch6 {"job_id": "z9.173923", "result_root": "/srv/result/iperf/2020-11-30/vm-2p8g/openeuler-20.03-aarch64/tcp-30/z9.173923", "job_state {"job_id": "z9.173923", "job_state": "boot"} @@ -173,7 +173,7 @@ options: hi8109@account-vm ~% submit -m -c borrow-1h.yaml testbox=vm-2p8g submit borrow-1h.yaml, got job_id=z9.173925 query=>{"job_id":["z9.173925"]} - connect to ws://172.168.131.2:11310/filter + connect to ws://172.168.131.2:20001/filter {"job_id":"z9.173925","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-30/vm-2p8g/openeuler-20.03-aarch {"job_id": "z9.173925", "result_root": "/srv/result/borrow/2020-11-30/vm-2p8g/openeuler-20.03-aarch64/3600/z9.173925", "job_state" {"job_id": "z9.173925", "job_state": "boot"} diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index a790736..da3f075 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -4,7 +4,7 @@
LKP_SRC ||= ENV['LKP_SRC'] || '/c/lkp-tests' MONITOR_HOST ||= ENV['MONITOR_HOST'] || '172.17.0.1' -MONITOR_PORT ||= ENV['MONITOR_PORT'] || '11310' +MONITOR_PORT ||= ENV['MONITOR_PORT'] || '20001' GIT_MIRROR_HOST ||= ENV['GIT_MIRROR_HOST'] || '172.17.0.1' DELIMITER_EMAIL ||= ENV['DELIMITER_EMAIL'] || 'delimiter@localhost' BISECT_RUN_SCRIPT = "#{ENV['CCI_SRC']}/src/delimiter/find-commit/bisect_run_script.rb" diff --git a/src/monitoring/constants.cr b/src/monitoring/constants.cr index 154c536..9e080c8 100644 --- a/src/monitoring/constants.cr +++ b/src/monitoring/constants.cr @@ -1,4 +1,4 @@ MQ_HOST = (ENV.has_key?("MQ_HOST") ? ENV["MQ_HOST"] : "172.17.0.1") MQ_PORT = (ENV.has_key?("MQ_PORT") ? ENV["MQ_PORT"] : 5672).to_i32
-MONITOR_PORT = (ENV.has_key?("MONITOR_PORT") ? ENV["MONITOR_PORT"] : 11310).to_i32 +MONITOR_PORT = (ENV.has_key?("MONITOR_PORT") ? ENV["MONITOR_PORT"] : 20001).to_i32