Commit 8ef3864a authored by Zhang Xiaoli's avatar Zhang Xiaoli
Browse files

DFS增加环境变量CSST_DFS_TOKEN

parent 7f892f4f
name: csst-msc-l1-mbi.app.process name: csst-msc-l1-mbi.apps
label: 主巡天一级流水线(mbi) label: 主巡天一级流水线(mbi)
comment: 主巡天一级流水线 comment: 主巡天一级流水线
cluster: csst-nao cluster: csst-zj
parameters: parameters:
initial_status: RUNNING initial_status: RUNNING
message_router: message-router-csst message_router: message-router-csst
...@@ -16,6 +16,7 @@ jobs: ...@@ -16,6 +16,7 @@ jobs:
#key_group_regex: ^(.+)$ #key_group_regex: ^(.+)$
#start_message: any #start_message: any
arguments: arguments:
task_timeout_seconds: 3000
max_sleep_count: 6000 max_sleep_count: 6000
slot_options: slot_on_head slot_options: slot_on_head
environments: environments:
...@@ -48,10 +49,8 @@ jobs: ...@@ -48,10 +49,8 @@ jobs:
key_group_regex: ^(.{6})(.{3})$ key_group_regex: ^(.{6})(.{3})$
key_group_seq: 1,2 key_group_seq: 1,2
environments: environments:
- CSST_DFS_API_MODE=${CSST_DFS_API_MODE}
- CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY} - CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY}
- CSST_DFS_APP_ID=${CSST_DFS_APP_ID} - CSST_DFS_TOKEN=${CSST_DFS_TOKEN}
- CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
- CCDS_SERVER_URL=${CCDS_SERVER_URL} - CCDS_SERVER_URL=${CCDS_SERVER_URL}
# - PGHOST=10.3.10.28:9090 # - PGHOST=10.3.10.28:9090
paths: paths:
...@@ -80,10 +79,8 @@ jobs: ...@@ -80,10 +79,8 @@ jobs:
key_group_regex: ^(.{6})(.{3})$ key_group_regex: ^(.{6})(.{3})$
key_group_seq: 1,2 key_group_seq: 1,2
environments: environments:
- CSST_DFS_API_MODE=${CSST_DFS_API_MODE}
- CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY} - CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY}
- CSST_DFS_APP_ID=${CSST_DFS_APP_ID} - CSST_DFS_TOKEN=${CSST_DFS_TOKEN}
- CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
- CCDS_SERVER_URL=${CCDS_SERVER_URL} - CCDS_SERVER_URL=${CCDS_SERVER_URL}
# - PGHOST=10.3.10.28:9090 # - PGHOST=10.3.10.28:9090
paths: paths:
...@@ -95,10 +92,9 @@ jobs: ...@@ -95,10 +92,9 @@ jobs:
sink_vjobs: sink_vjobs:
- csst-msc-l1-mbi-photmix - csst-msc-l1-mbi-photmix
hosts: hosts:
# - h0:10 - h0:1
- c0:20 # - n0:1
# - c1:1 # - n1:1
# - c2:1
csst-msc-l1-mbi-photmix: csst-msc-l1-mbi-photmix:
label: 多色成像测光 label: 多色成像测光
base_image: cnic/csst-msc-l1-mbi-photmix base_image: cnic/csst-msc-l1-mbi-photmix
...@@ -115,10 +111,12 @@ jobs: ...@@ -115,10 +111,12 @@ jobs:
key_group_regex: ^(.{6})(.{3})$ key_group_regex: ^(.{6})(.{3})$
key_group_seq: 1,2 key_group_seq: 1,2
environments: environments:
- CSST_DFS_API_MODE=${CSST_DFS_API_MODE} # - 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}
- CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY} - CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY}
- CSST_DFS_APP_ID=${CSST_DFS_APP_ID} - CSST_DFS_TOKEN=${CSST_DFS_TOKEN}
- CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
- CCDS_SERVER_URL=${CCDS_SERVER_URL} - CCDS_SERVER_URL=${CCDS_SERVER_URL}
# - PGHOST=10.3.10.28:9090 # - PGHOST=10.3.10.28:9090
paths: paths:
...@@ -128,8 +126,7 @@ jobs: ...@@ -128,8 +126,7 @@ jobs:
- ${CSST_AST_TEMP}:/pipeline/temp - ${CSST_AST_TEMP}:/pipeline/temp
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
hosts: hosts:
- h0:10 - h0:1
# - c0:10 # - n0:1
# - c1:1 # - n1:1
# - c2:1
\ No newline at end of file
# DFS # DFS
CSST_DFS_GATEWAY=10.3.10.28:30880 CSST_DFS_GATEWAY=172.24.232.11:28000
CSST_DFS_API_MODE=cluster CSST_DFS_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjQ4ODU0NTA2NjQsInN1YiI6InN5c3RlbSJ9.POsuUABytu8-WMtZiYehiYEa5BnlgqNTXT6X3OTyix0
CSST_DFS_APP_ID=test
CSST_DFS_APP_TOKEN=test
CSST_DFS_LOGS_DIR="."
# CCDS # CCDS
CCDS_SERVER_URL=http://10.3.10.28:29000 CCDS_SERVER_URL=http://172.24.232.11:29000
CCDS_USER=USER CCDS_USER=USER
CCDS_PASS=PASS CCDS_PASS=PASS
# VOLUMES # VOLUMES
# /dfs_root:ro # /dfs_root:ro
CSST_DFS_ROOT=/nfsdata/share/dfs/dfs_root CSST_DFS_ROOT=/data/dfs/files
# /ccds_root:ro # /ccds_root:ro
CCDS_ROOT=/nfsdata/share/dfs/ccds_root CCDS_ROOT=/data/ccds/files
# /pipeline/aux:ro # /pipeline/temp:rw
CSST_AUX_ROOT=/nfsdata/share/pipeline-inttest/aux CSST_AST_TEMP=/data/ast_temp
# /pipeline/temp:rw
CSST_AST_TEMP=/nfsdata/share/pipeline-inttest/ast_temp # HARBOR
HARBOR=zjlab-harbor.csst.nao
# TEST
CSST_INTTEST_ROOT=/data/pipeline-inttest
VERBOSE=true
# DAG yaml /dag-yaml:ro # DAG yaml /dag-yaml:ro
CSST_DAT_YAML_PATH=/nfsdata/share/dag-yaml CSST_DAT_YAML_PATH=/data/scalebox/dag-yaml
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