From 3640e3763b921bb9597f81d344645611c48bb3e5 Mon Sep 17 00:00:00 2001 From: zxl Date: Thu, 13 Jun 2024 14:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=85=BE=E8=AE=AF=E4=BA=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile | 10 +++----- L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile | 18 ++++----------- .../csst-msc-l1-sls1d/test/Makefile | 2 +- .../csst-msc-l1-sls1d/test/app.yaml | 23 ++++++------------- .../csst-msc-l1-sls1d/test/tencent.env | 19 +++++++++++++++ 5 files changed, 34 insertions(+), 38 deletions(-) create mode 100644 L1/dockerfiles/csst-msc-l1-sls1d/test/tencent.env diff --git a/L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile b/L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile index b0456ce..2a3e2f1 100644 --- a/L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile +++ b/L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile @@ -1,5 +1,5 @@ IMAGE_NAME:=cnic/csst-msc-l1-sls1d-adm -IMAGE_PATH:=/sharewcl/temp +IMAGE_PATH:=/goosefsx/x-c70-y4s971cs-proxy/temp build: docker build --network=host -t $(IMAGE_NAME) . @@ -7,10 +7,6 @@ dist: build #docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load' docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l1-sls1d-adm.tar ssh c0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar - ssh c1 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar - ssh c2 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar - ssh n0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar - ssh n1 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar push: docker push $(IMAGE_NAME) run: @@ -18,6 +14,6 @@ run: down: docker stop $(IMAGE_NAME) scp: - scp -r ./ csst-zjs:/root/csst/csst-msc-l1-sls1d/adm/ + scp -r ./ tencent-p0:/root/csst/csst-msc-l1-sls1d/adm/ save: - docker save $(IMAGE_NAME) > /sharewcl/temp/msc-l1-sls1d-adm.tar \ No newline at end of file + docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l1-sls1d-adm.tar \ No newline at end of file diff --git a/L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile b/L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile index 74222c0..ae9d4d3 100644 --- a/L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile +++ b/L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile @@ -1,22 +1,12 @@ IMAGE_NAME:=cnic/csst-msc-l1-sls1d-exe -IMAGE_PATH:=/sharewcl/temp +IMAGE_PATH:=/goosefsx/x-c70-y4s971cs-proxy/temp build: docker build --network=host -t $(IMAGE_NAME) . dist: build #docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load' docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh c0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh c1 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh c2 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh n0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh n1 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh n0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh w2 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh w3 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh w4 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh w5 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar - ssh w6 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar + ssh c0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar push: docker push $(IMAGE_NAME) run: @@ -24,6 +14,6 @@ run: down: docker stop $(IMAGE_NAME) scp: - scp -r ./ csst-zjs:/root/csst/csst-msc-l1-sls1d/exe/ + scp -r ./ tencent-p0:/root/csst/csst-msc-l1-sls1d/exe/ save: - docker save $(IMAGE_NAME) > /sharewcl/temp/msc-l1-sls1d-exe.tar \ No newline at end of file + docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l1-sls1d-exe.tar \ No newline at end of file diff --git a/L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile b/L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile index 276bba5..eeeda7e 100644 --- a/L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile +++ b/L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile @@ -3,7 +3,7 @@ CLUSTER=csst all: reset build run: - scalebox app create --env-file zjs.env + scalebox app create --env-file tencent.env reset: cd ${HOME}/docker-scalebox/clusters/$(CLUSTER) && make && cd - diff --git a/L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml b/L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml index ee4dd81..442d286 100644 --- a/L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml +++ b/L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml @@ -10,7 +10,7 @@ jobs: csst-msc-l1-sls1d-adm: label: 无缝光谱1D管理模块 base_image: cnic/csst-msc-l1-sls1d-adm:latest - # schedule_mode: HEAD + schedule_mode: HEAD variables: # always_running: yes output_text_size: 100000 @@ -39,7 +39,6 @@ jobs: # - c0:1 # - c1:1 # - c2:1 - - n0:1 csst-msc-l1-sls1d-exe: label: 无缝光谱1D执行模块 base_image: cnic/csst-msc-l1-sls1d-exe:latest @@ -53,10 +52,10 @@ jobs: locale_mode: NONE # grpc_server: 172.24.23.6:50051 environments: - - CSST_DFS_API_MODE=cluster - - CSST_DFS_GATEWAY=172.24.27.2:30880 - - CSST_DFS_APP_ID=test - - CSST_DFS_APP_TOKEN=test + - CSST_DFS_API_MODE=${CSST_DFS_API_MODE} + - CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY} + - CSST_DFS_APP_ID=${CSST_DFS_APP_ID} + - CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN} paths: # change /share to /sharewcl in PML production environment # output directory, omit this line in production - ${CSST_AUX_DIR}:/pipeline/aux @@ -65,14 +64,6 @@ jobs: # command: > # python /pipeline/src/run.py {\"brick_id\":1} hosts: - # - h0:1 + - h0:5 - c0:10 - - c1:10 - - c2:10 - - n0:5 - - n1:15 - - w2:15 - - w3:15 - - w4:15 - - w5:15 - - w6:15 \ No newline at end of file + \ No newline at end of file diff --git a/L1/dockerfiles/csst-msc-l1-sls1d/test/tencent.env b/L1/dockerfiles/csst-msc-l1-sls1d/test/tencent.env new file mode 100644 index 0000000..786da64 --- /dev/null +++ b/L1/dockerfiles/csst-msc-l1-sls1d/test/tencent.env @@ -0,0 +1,19 @@ +# *.env: The env variables are used for running pipeline. + +# TCC + +# ENV_FILE=tcc.env + +# DFS +CSST_DFS_API_MODE=cluster +CSST_DFS_GATEWAY=10.0.0.136:30880 +CSST_DFS_APP_ID=test +CSST_DFS_APP_TOKEN=test +# CRDS +CRDS_SERVER_URL=http://10.0.0.136:29000 + +# VOLUMES ================== +CSST_DFS_ROOT=/goosefsx/x-c70-y4s971cs-proxy/dfs +CSST_CRDS_ROOT=/goosefsx/x-c70-y4s971cs-proxy/crdsdata/data +CSST_AUX_DIR=/goosefsx/x-c70-y4s971cs-proxy/pipeline/aux + -- GitLab