Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
csst
Scalebox Apps
Commits
3640e376
Commit
3640e376
authored
1 year ago
by
Zhang Xiaoli
Browse files
Options
Download
Email Patches
Plain Diff
腾讯云环境测试配置版本
parent
198aabea
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
38 deletions
+34
-38
L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile
L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile
+3
-7
L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile
L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile
+4
-14
L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile
L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile
+1
-1
L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml
L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml
+7
-16
L1/dockerfiles/csst-msc-l1-sls1d/test/tencent.env
L1/dockerfiles/csst-msc-l1-sls1d/test/tencent.env
+19
-0
No files found.
L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile
View file @
3640e376
IMAGE_NAME
:=
cnic/csst-msc-l1-sls1d-adm
IMAGE_NAME
:=
cnic/csst-msc-l1-sls1d-adm
IMAGE_PATH
:=
/
sharewcl
/temp
IMAGE_PATH
:=
/
goosefsx/x-c70-y4s971cs-proxy
/temp
build
:
build
:
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
...
@@ -7,10 +7,6 @@ dist: build
...
@@ -7,10 +7,6 @@ dist: build
#docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load'
#docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load'
docker
save
$(IMAGE_NAME)
>
$(IMAGE_PATH)/msc-l1-sls1d-adm.tar
docker
save
$(IMAGE_NAME)
>
$(IMAGE_PATH)/msc-l1-sls1d-adm.tar
ssh
c0
docker
load
-i
$(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
:
push
:
docker push
$(IMAGE_NAME)
docker push
$(IMAGE_NAME)
run
:
run
:
...
@@ -18,6 +14,6 @@ run:
...
@@ -18,6 +14,6 @@ run:
down
:
down
:
docker stop
$(IMAGE_NAME)
docker stop
$(IMAGE_NAME)
scp
:
scp
:
scp
-r
./
csst-zjs
:/root/csst/csst-msc-l1-sls1d/adm/
scp
-r
./
tencent-p0
:/root/csst/csst-msc-l1-sls1d/adm/
save
:
save
:
docker save
$(IMAGE_NAME)
>
/sharewcl/temp/msc-l1-sls1d-adm.tar
docker save
$(IMAGE_NAME)
>
$(IMAGE_PATH)
/msc-l1-sls1d-adm.tar
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile
View file @
3640e376
IMAGE_NAME
:=
cnic/csst-msc-l1-sls1d-exe
IMAGE_NAME
:=
cnic/csst-msc-l1-sls1d-exe
IMAGE_PATH
:=
/
sharewcl
/temp
IMAGE_PATH
:=
/
goosefsx/x-c70-y4s971cs-proxy
/temp
build
:
build
:
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
dist
:
build
dist
:
build
#docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load'
#docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load'
docker
save
$(IMAGE_NAME)
>
$(IMAGE_PATH)/msc-l1-sls1d-exe.tar
docker
save
$(IMAGE_NAME)
>
$(IMAGE_PATH)/msc-l1-sls1d-exe.tar
ssh
c0
docker
load
-i
$(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
push
:
push
:
docker push
$(IMAGE_NAME)
docker push
$(IMAGE_NAME)
run
:
run
:
...
@@ -24,6 +14,6 @@ run:
...
@@ -24,6 +14,6 @@ run:
down
:
down
:
docker stop
$(IMAGE_NAME)
docker stop
$(IMAGE_NAME)
scp
:
scp
:
scp
-r
./
csst-zjs
:/root/csst/csst-msc-l1-sls1d/exe/
scp
-r
./
tencent-p0
:/root/csst/csst-msc-l1-sls1d/exe/
save
:
save
:
docker save
$(IMAGE_NAME)
>
/sharewcl/temp/msc-l1-sls1d-exe.tar
docker save
$(IMAGE_NAME)
>
$(IMAGE_PATH)
/msc-l1-sls1d-exe.tar
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile
View file @
3640e376
...
@@ -3,7 +3,7 @@ CLUSTER=csst
...
@@ -3,7 +3,7 @@ CLUSTER=csst
all
:
reset build
all
:
reset build
run
:
run
:
scalebox app create
--env-file
zjs
.env
scalebox app create
--env-file
tencent
.env
reset
:
reset
:
cd
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
&&
make
&&
cd
-
cd
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
&&
make
&&
cd
-
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml
View file @
3640e376
...
@@ -10,7 +10,7 @@ jobs:
...
@@ -10,7 +10,7 @@ jobs:
csst-msc-l1-sls1d-adm
:
csst-msc-l1-sls1d-adm
:
label
:
无缝光谱1D管理模块
label
:
无缝光谱1D管理模块
base_image
:
cnic/csst-msc-l1-sls1d-adm:latest
base_image
:
cnic/csst-msc-l1-sls1d-adm:latest
#
schedule_mode: HEAD
schedule_mode
:
HEAD
variables
:
variables
:
# always_running: yes
# always_running: yes
output_text_size
:
100000
output_text_size
:
100000
...
@@ -39,7 +39,6 @@ jobs:
...
@@ -39,7 +39,6 @@ jobs:
# - c0:1
# - c0:1
# - c1:1
# - c1:1
# - c2:1
# - c2:1
-
n0:1
csst-msc-l1-sls1d-exe
:
csst-msc-l1-sls1d-exe
:
label
:
无缝光谱1D执行模块
label
:
无缝光谱1D执行模块
base_image
:
cnic/csst-msc-l1-sls1d-exe:latest
base_image
:
cnic/csst-msc-l1-sls1d-exe:latest
...
@@ -53,10 +52,10 @@ jobs:
...
@@ -53,10 +52,10 @@ jobs:
locale_mode
:
NONE
locale_mode
:
NONE
# grpc_server: 172.24.23.6:50051
# grpc_server: 172.24.23.6:50051
environments
:
environments
:
-
CSST_DFS_API_MODE=
cluster
-
CSST_DFS_API_MODE=
${CSST_DFS_API_MODE}
-
CSST_DFS_GATEWAY=
172.24.27.2:30880
-
CSST_DFS_GATEWAY=
${CSST_DFS_GATEWAY}
-
CSST_DFS_APP_ID=
test
-
CSST_DFS_APP_ID=
${CSST_DFS_APP_ID}
-
CSST_DFS_APP_TOKEN=
test
-
CSST_DFS_APP_TOKEN=
${CSST_DFS_APP_TOKEN}
paths
:
# change /share to /sharewcl in PML production environment
paths
:
# change /share to /sharewcl in PML production environment
# output directory, omit this line in production
# output directory, omit this line in production
-
${CSST_AUX_DIR}:/pipeline/aux
-
${CSST_AUX_DIR}:/pipeline/aux
...
@@ -65,14 +64,6 @@ jobs:
...
@@ -65,14 +64,6 @@ jobs:
# command: >
# command: >
# python /pipeline/src/run.py {\"brick_id\":1}
# python /pipeline/src/run.py {\"brick_id\":1}
hosts
:
hosts
:
#
- h0:
1
-
h0:
5
-
c0:10
-
c0:10
-
c1:10
-
c2:10
\ No newline at end of file
-
n0:5
-
n1:15
-
w2:15
-
w3:15
-
w4:15
-
w5:15
-
w6:15
\ No newline at end of file
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-sls1d/test/tencent.env
0 → 100644
View file @
3640e376
# *.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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment