Skip to content

GitLab

Commit c82218bb authored by Zhang Xiaoli's avatar Zhang Xiaoli
Browse files

update hub.cstcloud.cn/scalebox/base to the latest, and Modify the env by... 

update hub.cstcloud.cn/scalebox/base to the latest, and Modify the env by https://csst-tb.bao.ac.cn/code/csst-cicd/csst-env/
parent b951322c
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 43 deletions
L1/dockerfiles/csst-cpic-l1/Dockerfile
View file @ c82218bb
......@@ -3,7 +3,7 @@ FROM csst/csst-cpic-l1:latest
USER root
COPY run.sh /app/bin/
RUN chmod +x /app/bin/run.sh
COPY --from=hub.cstcloud.cn/scalebox/base:0.9 /usr/local/sbin /usr/local/sbin
COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin
RUN mkdir /work/
WORKDIR /work/
......
L1/dockerfiles/csst-cpic-l1/test/app.yaml
View file @ c82218bb
......@@ -9,7 +9,7 @@ jobs:
cpic-l1:
label: 星冕仪
base_image: cnic/csst-cpic-l1
# schedule_mode: HEAD
schedule_mode: HEAD
variables:
always_running: yes
reserved_on_exit: yes
......@@ -32,11 +32,11 @@ jobs:
- ${CSST_CRDS_REF}:/crdsref
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
# sink_jobs:
hosts:
# hosts:
# - h0:1
# - c0:1
- c1:1
- c2:1
# - c1:1
# - c2:1
L1/dockerfiles/csst-cpic-l1/test/zjs.env
View file @ c82218bb
......@@ -8,5 +8,5 @@ CRDS_SERVER_URL=http://172.24.27.2:29000
# VOLUMES ==================
CSST_DFS_ROOT=/sharewcl/dfs
CSST_CRDS_REF=/sharewcl/crdsdata/data/references
CSST_CRDS_ROOT=/sharewcl/crdsdata/data/references
CSST_AUX_DIR=/sharewcl/pipeline/aux
L1/dockerfiles/csst-hstdm-l1/Dockerfile
View file @ c82218bb
......@@ -3,7 +3,7 @@ FROM csst/csst-hstdm-l1:latest
USER root
COPY run.sh /app/bin/
RUN chmod +x /app/bin/run.sh
COPY --from=hub.cstcloud.cn/scalebox/base:0.9 /usr/local/sbin /usr/local/sbin
COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin
RUN mkdir /work/
WORKDIR /work/
......
L1/dockerfiles/csst-hstdm-l1/test/app.yaml
View file @ c82218bb
......@@ -9,7 +9,7 @@ jobs:
hstdm-l1:
label: 太赫兹
base_image: cnic/csst-hstdm-l1
# schedule_mode: HEAD
schedule_mode: HEAD
variables:
always_running: yes
reserved_on_exit: yes
......@@ -29,12 +29,12 @@ jobs:
paths:
- ${CSST_AUX_DIR}:/pipeline/aux
- ${CSST_DFS_ROOT}:/dfsroot
- ${CSST_CRDS_REF}:/crdsref
- ${CSST_CRDS_ROOT}:/crdsref
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
# sink_jobs:
hosts:
- h0:1
- c0:1
# hosts:
# - h0:1
# - c0:1
# - c1:1
# - c2:1
......
L1/dockerfiles/csst-hstdm-l1/test/zjs.env
View file @ c82218bb
......@@ -8,5 +8,5 @@ CRDS_SERVER_URL=http://172.24.27.2:29000
# VOLUMES ==================
CSST_DFS_ROOT=/sharewcl/dfs
CSST_CRDS_REF=/sharewcl/crdsdata/data/references
CSST_CRDS_ROOT=/sharewcl/crdsdata/data/references
CSST_AUX_DIR=/sharewcl/pipeline/aux
L1/dockerfiles/csst-ifs-l1-rss/test/app.yaml
View file @ c82218bb
......@@ -11,7 +11,7 @@ jobs:
output_text_size: 100000
text_tranc_mode: TAIL
locale_mode: NONE
grpc_server: 172.24.23.6:50051
# grpc_server: 172.24.23.6:50051
parameters:
# start_message: scalebox
key_group_regex: ^(.{6})(.{3})$
......@@ -22,8 +22,8 @@ jobs:
- ${DFS_ROOT}:/L1Pipeline/dfs
# command: docker run -d --network=host %ENVS% %VOLUMES% {{IMAGE}}
# sink_jobs:
# hosts:
# - h0:1
# - c0:2
# - c1:2
# - c2:2
\ No newline at end of file
hosts:
# - h0:1
- c0:2
# - c1:2
# - c2:2
\ No newline at end of file
L1/dockerfiles/csst-msc-l1-mbi/Dockerfile
View file @ c82218bb
......@@ -3,7 +3,7 @@ FROM csst/csst-msc-l1-mbi:latest
USER root
COPY run.sh /app/bin/
RUN chmod +x /app/bin/run.sh
COPY --from=hub.cstcloud.cn/scalebox/base:0.9 /usr/local/sbin /usr/local/sbin
COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin
RUN mkdir /work/
WORKDIR /work/
......
L1/dockerfiles/csst-msc-l1-mbi/run.sh
View file @ c82218bb
......@@ -40,8 +40,10 @@ rm -rf /pipeline/input/* /pipeline/output/*
echo finish mbi.
for i in 06 07 08 09 11 12 13 14 15 16 17 18 19 20 22 23 24 25 ; do
echo $1-$i >> /work/messages.txt
done
if [ $exit_code -eq 0 ]; then
for i in 06 07 08 09 11 12 13 14 15 16 17 18 19 20 22 23 24 25 ; do
echo $1-$i >> /work/messages.txt
done
fi
exit $exit_code
L1/dockerfiles/csst-msc-l1-phot/Dockerfile
View file @ c82218bb
......@@ -3,7 +3,7 @@ FROM csst/csst-msc-l1-phot:latest
USER root
COPY run.sh /app/bin/
RUN chmod +x /app/bin/run.sh
COPY --from=hub.cstcloud.cn/scalebox/base:0.9 /usr/local/sbin /usr/local/sbin
COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin
RUN mkdir /work/
WORKDIR /work/
......
L1/dockerfiles/csst-msc-l1-phot/run.sh
View file @ c82218bb
......@@ -12,8 +12,11 @@ echo "detector: "$detector
python /pipeline/src/run.py $obsid $detector
exit_code=$?
echo "=====pipeline.log====" > /work/user-file.txt
cat /pipeline/output/pipeline.log >> /work/user-file.txt
pipeline=/pipeline/output/pipeline.log
if test -f "$pipeline"; then
echo "=====pipeline.log====" > /work/user-file.txt
cat /pipeline/output/pipeline.log >> /work/user-file.txt
fi
timefile=/pipeline/output/timestamps.txt
if test -f "$timefile"; then
......
L1/dockerfiles/csst-msc-l1-phot/test/app.yaml
View file @ c82218bb
name: msc-l1-phot.app.process
name: msc-l1-mbi-phot.app.process
label: 多色成像+测光
comment: 主巡天多色成像一级流水线
cluster: csst
......@@ -9,7 +9,7 @@ jobs:
msc-l1-mbi:
label: 多色成像
base_image: cnic/csst-msc-l1-mbi
# schedule_mode: HEAD
schedule_mode: HEAD
variables:
# always_running: yes
# reserved_on_exit: yes
......@@ -33,15 +33,15 @@ jobs:
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
sink_jobs:
- msc-l1-phot
hosts:
- h0:1
- c0:1
- c1:1
# hosts:
# - h0:1
# - c0:1
# - c1:1
# - c2:1
msc-l1-phot:
label: 测光
base_image: cnic/csst-msc-l1-phot
# schedule_mode: HEAD
schedule_mode: HEAD
variables:
# always_running: yes
# reserved_on_exit: yes
......@@ -68,6 +68,6 @@ jobs:
# - h0:1
# - c0:1
# - c1:1
- c2:1
# - c2:1
L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile
View file @ c82218bb
......@@ -3,7 +3,7 @@ FROM csst/csst-msc-l1-sls2d:latest
USER root
COPY run.sh /app/bin/
RUN chmod +x /app/bin/run.sh
COPY --from=hub.cstcloud.cn/scalebox/base:0.9 /usr/local/sbin /usr/local/sbin
COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin
RUN mkdir /work/
WORKDIR /work/
......
L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml
View file @ c82218bb
......@@ -9,7 +9,7 @@ jobs:
msc-l1-sls2d:
label: 无缝光谱2D
base_image: cnic/csst-msc-l1-sls2d
# schedule_mode: HEAD
schedule_mode: HEAD
variables:
always_running: yes
reserved_on_exit: yes
......@@ -18,10 +18,15 @@ jobs:
output_text_size: 100000
text_tranc_mode: TAIL
locale_mode: NONE
grpc_server: 172.24.23.6:50051
# grpc_server: 172.24.23.6:50051
parameters:
key_group_regex: ^(.{6})(.{3})$
key_group_seq: 1,2
environments:
- CSST_DFS_API_MODE=cluster
- CSST_DFS_GATEWAY=172.24.27.2:30880
- CSST_DFS_APP_ID=test
- CSST_DFS_APP_TOKEN=test
paths:
- ${CSST_AUX_DIR}:/pipeline/aux
- ${CSST_DFS_ROOT}:/dfsroot
......
L1/dockerfiles/csst-msc-l1-sls2d/test/zjs.env
View file @ c82218bb
# AUX_DIR=/sharewcl/pipeline/aux
# CRDS_DIR=/sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr
# DFS_ROOT=/sharewcl/dfs
# DFS
CSST_DFS_API_MODE=cluster
CSST_DFS_GATEWAY=172.24.27.2:30880
CSST_DFS_APP_ID=test
CSST_DFS_APP_TOKEN=test
# CRDS
CRDS_SERVER_URL=http://172.24.27.2:29000
AUX_DIR=/share/pipeline/aux
CRDS_DIR=/share/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr
DFS_ROOT=/share/dfs
\ No newline at end of file
# VOLUMES ==================
CSST_DFS_ROOT=/sharewcl/dfs
CSST_CRDS_ROOT=/sharewcl/crdsdata/data
CSST_AUX_DIR=/sharewcl/pipeline/aux
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