From 2ec4146c177985b0252e8d0f92a8b485b1c4666d Mon Sep 17 00:00:00 2001 From: zxl Date: Fri, 24 Feb 2023 16:59:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=85=BE=E8=AE=AF=E4=BA=91?= =?UTF-8?q?=E5=8D=95=E8=8A=82=E7=82=B9=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- L1/dockerfiles/crds/Dockerfile | 12 + L1/dockerfiles/crds/Makefile | 18 ++ L1/dockerfiles/crds/gen_sql.sh | 9 + L1/dockerfiles/crds/list.txt | 320 +++++++++++++++++++++++++ L1/dockerfiles/crds/run.sh | 34 +++ L1/dockerfiles/crds/test/Makefile | 16 ++ L1/dockerfiles/crds/test/app.yaml | 41 ++++ L1/dockerfiles/mbi/Dockerfile | 2 +- L1/dockerfiles/mbi/run.sh | 33 ++- L1/dockerfiles/mbi/test/Makefile | 2 +- L1/dockerfiles/mbi/test/app.yaml | 14 +- L1/dockerfiles/mbi/test/tencent.env | 3 + L1/dockerfiles/mbi/test/zjs.env | 3 + L1/dockerfiles/module2/Dockerfile | 5 +- L1/dockerfiles/redis-cli/Dockerfile | 3 +- L1/dockerfiles/sls2d/Dockerfile | 3 +- L1/dockerfiles/sls2d/Makefile | 16 +- L1/dockerfiles/sls2d/run.sh | 24 +- L1/dockerfiles/sls2d/test/add_tasks.sh | 17 ++ L1/dockerfiles/sls2d/test/app.yaml | 25 +- 20 files changed, 565 insertions(+), 35 deletions(-) create mode 100644 L1/dockerfiles/crds/Dockerfile create mode 100644 L1/dockerfiles/crds/Makefile create mode 100644 L1/dockerfiles/crds/gen_sql.sh create mode 100644 L1/dockerfiles/crds/list.txt create mode 100644 L1/dockerfiles/crds/run.sh create mode 100644 L1/dockerfiles/crds/test/Makefile create mode 100644 L1/dockerfiles/crds/test/app.yaml create mode 100644 L1/dockerfiles/mbi/test/tencent.env create mode 100644 L1/dockerfiles/mbi/test/zjs.env create mode 100644 L1/dockerfiles/sls2d/test/add_tasks.sh diff --git a/L1/dockerfiles/crds/Dockerfile b/L1/dockerfiles/crds/Dockerfile new file mode 100644 index 0000000..48507cf --- /dev/null +++ b/L1/dockerfiles/crds/Dockerfile @@ -0,0 +1,12 @@ +FROM csst-l1ppl:6.0.144 + +COPY gen_sql.sh /app/bin/ +RUN chmod +x /app/bin/gen_sql.sh +COPY run.sh /app/bin/ +RUN chmod +x /app/bin/run.sh +COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin + +RUN mkdir /work/ +WORKDIR /work/ + +ENTRYPOINT ["goagent"] \ No newline at end of file diff --git a/L1/dockerfiles/crds/Makefile b/L1/dockerfiles/crds/Makefile new file mode 100644 index 0000000..43f15a2 --- /dev/null +++ b/L1/dockerfiles/crds/Makefile @@ -0,0 +1,18 @@ +IMAGE_NAME:=csst/crds + +build: + docker build --network=host -t $(IMAGE_NAME) . + +dist: +#docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load' + docker save $(IMAGE_NAME) > /share/tmp/crds.tar + ssh c0 docker load -i /share/tmp/crds.tar + ssh c1 docker load -i /share/tmp/crds.tar + ssh c2 docker load -i /share/tmp/crds.tar + +push: + docker push $(IMAGE_NAME) +run: + docker run -it --entrypoint bash $(IMAGE_NAME) +down: + docker stop $(IMAGE_NAME) diff --git a/L1/dockerfiles/crds/gen_sql.sh b/L1/dockerfiles/crds/gen_sql.sh new file mode 100644 index 0000000..57306e6 --- /dev/null +++ b/L1/dockerfiles/crds/gen_sql.sh @@ -0,0 +1,9 @@ + +#!/bin/bash + +export JOB_ID=1 + +for line in `cat list.txt` +do + echo "INSERT INTO t_task(job,key_message) VALUES($JOB_ID,'${line}');" +done diff --git a/L1/dockerfiles/crds/list.txt b/L1/dockerfiles/crds/list.txt new file mode 100644 index 0000000..a232bfd --- /dev/null +++ b/L1/dockerfiles/crds/list.txt @@ -0,0 +1,320 @@ +test202210/P01_N6397_030s_Astrometry-off/MSC_0000000/,test202210/P01_N6397_030s_Astrometry-off/MSC_0000000_L1/,4 +test202210/P01_N6397_030s_Astrometry-on/MSC_0000000/,test202210/P01_N6397_030s_Astrometry-on/MSC_0000000_L1/,4 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000000/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000000_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000001/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000001_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000002/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000002_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000003/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000003_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000004/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000004_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000005/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000005_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000006/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000006_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000007/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000007_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000008/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000008_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000009/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000009_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000010/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000010_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000011/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000011_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000012/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000012_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000013/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000013_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000014/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000014_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000015/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000015_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000016/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000016_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000017/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000017_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000018/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000018_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000019/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000019_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000020/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000020_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000021/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000021_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000022/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000022_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000023/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000023_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000024/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000024_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000025/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000025_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000026/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000026_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000027/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000027_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000028/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000028_L1/,3 +test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000029/,test202210/P30_GAC_150s_Astrometry-on_BF-on/MSC_0000029_L1/,3 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000000/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000000_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000001/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000001_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000002/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000002_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000003/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000003_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000004/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000004_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000005/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000005_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000006/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000006_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000007/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000007_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000008/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000008_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000009/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000009_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000010/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000010_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000011/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000011_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000012/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000012_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000013/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000013_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000014/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000014_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000015/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000015_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000016/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000016_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000017/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000017_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000018/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000018_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000019/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000019_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000020/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000020_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000021/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000021_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000022/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000022_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000023/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000023_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000024/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000024_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000025/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000025_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000026/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000026_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000027/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000027_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000028/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000028_L1/,6 +test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000029/,test202210/P30_N6397_150s_Astrometry-on_BF-on_AllChips/MSC_0000029_L1/,6 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000000/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000000_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000001/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000001_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000002/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000002_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000003/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000003_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000004/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000004_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000005/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000005_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000006/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000006_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000007/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000007_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000008/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000008_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000009/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000009_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000010/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000010_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000011/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000011_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000012/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000012_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000013/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000013_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000014/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000014_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000015/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000015_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000016/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000016_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000017/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000017_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000018/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000018_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000019/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000019_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000020/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000020_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000021/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000021_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000022/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000022_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000023/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000023_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000024/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000024_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000025/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000025_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000026/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000026_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000027/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000027_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000028/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000028_L1/,5 +test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000029/,test202210/P30_NGP_150s_Astrometry-on_BF-on/MSC_0000029_L1/,5 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000000/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000000_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000001/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000001_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000002/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000002_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000003/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000003_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000004/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000004_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000005/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000005_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000006/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000006_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000007/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000007_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000008/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000008_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000009/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000009_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000010/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000010_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000011/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000011_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000012/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000012_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000013/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000013_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000014/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000014_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000015/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000015_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000016/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000016_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000017/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000017_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000018/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000018_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000019/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000019_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000020/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000020_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000021/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000021_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000022/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000022_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000023/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000023_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000024/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000024_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000025/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000025_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000026/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000026_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000027/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000027_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000028/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000028_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000029/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000029_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000030/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000030_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000031/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000031_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000032/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000032_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000033/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000033_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000034/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000034_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000035/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000035_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000036/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000036_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000037/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000037_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000038/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000038_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000039/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000039_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000040/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000040_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000041/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000041_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000042/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000042_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000043/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000043_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000044/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000044_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000045/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000045_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000046/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000046_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000047/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000047_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000048/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000048_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000049/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000049_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000050/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000050_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000051/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000051_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000052/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000052_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000053/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000053_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000054/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000054_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000055/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000055_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000056/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000056_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000057/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000057_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000058/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000058_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000059/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000059_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000060/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000060_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000061/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000061_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000062/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000062_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000063/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000063_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000064/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000064_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000065/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000065_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000066/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000066_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000067/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000067_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000068/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000068_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000069/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000069_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000070/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000070_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000071/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000071_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000072/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000072_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000073/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000073_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000074/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000074_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000075/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000075_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000076/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000076_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000077/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000077_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000078/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000078_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000079/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000079_L1/,6 +test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000080/,test202210/P81_N6397_150s_Astrometry-on_BF-on_9x9/MSC_0000080_L1/,6 +test202211/P01_Ant_020s_Astrometry-on/MSC_0000000/,test202211/P01_Ant_020s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_Ant_030s_Astrometry-on/MSC_0000000/,test202211/P01_Ant_030s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_Ant_150s_Astrometry-on/MSC_0000000/,test202211/P01_Ant_150s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_Bulge_020s_Astrometry-on/MSC_0000000/,test202211/P01_Bulge_020s_Astrometry-on/MSC_0000000_L1/,4 +test202211/P01_Bulge_030s_Astrometry-on/MSC_0000000/,test202211/P01_Bulge_030s_Astrometry-on/MSC_0000000_L1/,4 +test202211/P01_Bulge_150s_Astrometry-on/MSC_0000000/,test202211/P01_Bulge_150s_Astrometry-on/MSC_0000000_L1/,4 +test202211/P01_Fornax_020s_Astrometry-on/MSC_0000000/,test202211/P01_Fornax_020s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_Fornax_030s_Astrometry-on/MSC_0000000/,test202211/P01_Fornax_030s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_Fornax_150s_Astrometry-on/MSC_0000000/,test202211/P01_Fornax_150s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_GAC_020s_Astrometry-on/MSC_0000000/,test202211/P01_GAC_020s_Astrometry-on/MSC_0000000_L1/,2 +test202211/P01_GAC_030s_Astrometry-on/MSC_0000000/,test202211/P01_GAC_030s_Astrometry-on/MSC_0000000_L1/,2 +test202211/P01_GAC_150s_Astrometry-on/MSC_0000000/,test202211/P01_GAC_150s_Astrometry-on/MSC_0000000_L1/,2 +test202211/P01_N3532_020s_Astrometry-on/MSC_0000000/,test202211/P01_N3532_020s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_N3532_030s_Astrometry-on/MSC_0000000/,test202211/P01_N3532_030s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_N3532_150s_Astrometry-on/MSC_0000000/,test202211/P01_N3532_150s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_N6397_020s_Astrometry-on/MSC_0000000/,test202211/P01_N6397_020s_Astrometry-on/MSC_0000000_L1/,4 +test202211/P01_N6397_030s_Astrometry-on/MSC_0000000/,test202211/P01_N6397_030s_Astrometry-on/MSC_0000000_L1/,4 +test202211/P01_N6397_150s_Astrometry-on/MSC_0000000/,test202211/P01_N6397_150s_Astrometry-on/MSC_0000000_L1/,4 +test202211/P01_NEP_020s_Astrometry-on/MSC_0000000/,test202211/P01_NEP_020s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_NEP_030s_Astrometry-on/MSC_0000000/,test202211/P01_NEP_030s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_NEP_150s_Astrometry-on/MSC_0000000/,test202211/P01_NEP_150s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_NGP_020s_Astrometry-on/MSC_0000000/,test202211/P01_NGP_020s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_NGP_030s_Astrometry-on/MSC_0000000/,test202211/P01_NGP_030s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_NGP_150s_Astrometry-on/MSC_0000000/,test202211/P01_NGP_150s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_Sculptor_020s_Astrometry-on/MSC_0000000/,test202211/P01_Sculptor_020s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_Sculptor_030s_Astrometry-on/MSC_0000000/,test202211/P01_Sculptor_030s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P01_Sculptor_150s_Astrometry-on/MSC_0000000/,test202211/P01_Sculptor_150s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000000/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000000_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000001/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000001_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000002/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000002_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000003/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000003_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000004/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000004_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000005/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000005_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000006/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000006_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000007/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000007_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000008/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000008_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000009/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000009_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000010/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000010_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000011/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000011_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000012/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000012_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000013/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000013_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000014/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000014_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000015/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000015_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000016/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000016_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000017/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000017_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000018/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000018_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000019/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000019_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000020/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000020_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000021/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000021_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000022/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000022_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000023/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000023_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000024/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000024_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000025/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000025_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000026/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000026_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000027/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000027_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000028/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000028_L1/,1 +test202211/P30_Ant_150s_Astrometry-on/MSC_0000029/,test202211/P30_Ant_150s_Astrometry-on/MSC_0000029_L1/,1 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000000/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000000_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000001/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000001_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000002/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000002_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000003/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000003_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000004/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000004_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000005/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000005_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000006/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000006_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000007/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000007_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000008/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000008_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000009/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000009_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000010/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000010_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000011/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000011_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000012/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000012_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000013/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000013_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000014/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000014_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000015/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000015_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000016/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000016_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000017/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000017_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000018/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000018_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000019/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000019_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000020/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000020_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000021/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000021_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000022/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000022_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000023/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000023_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000024/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000024_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000025/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000025_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000026/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000026_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000027/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000027_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000028/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000028_L1/,3 +test202211/P30_GAC_150s_Astrometry-on/MSC_0000029/,test202211/P30_GAC_150s_Astrometry-on/MSC_0000029_L1/,3 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000000/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000000_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000001/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000001_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000002/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000002_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000003/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000003_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000004/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000004_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000005/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000005_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000006/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000006_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000007/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000007_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000008/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000008_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000009/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000009_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000010/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000010_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000011/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000011_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000012/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000012_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000013/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000013_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000014/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000014_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000015/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000015_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000016/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000016_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000017/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000017_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000018/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000018_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000019/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000019_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000020/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000020_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000021/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000021_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000022/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000022_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000023/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000023_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000024/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000024_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000025/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000025_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000026/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000026_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000027/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000027_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000028/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000028_L1/,6 +test202211/P30_NEP_150s_Astrometry-on/MSC_0000029/,test202211/P30_NEP_150s_Astrometry-on/MSC_0000029_L1/,6 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000000/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000000_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000001/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000001_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000002/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000002_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000003/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000003_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000004/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000004_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000005/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000005_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000006/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000006_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000007/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000007_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000008/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000008_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000009/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000009_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000010/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000010_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000011/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000011_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000012/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000012_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000013/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000013_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000014/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000014_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000015/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000015_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000016/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000016_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000017/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000017_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000018/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000018_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000019/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000019_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000020/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000020_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000021/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000021_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000022/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000022_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000023/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000023_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000024/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000024_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000025/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000025_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000026/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000026_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000027/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000027_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000028/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000028_L1/,5 +test202211/P30_NGP_150s_Astrometry-on/MSC_0000029/,test202211/P30_NGP_150s_Astrometry-on/MSC_0000029_L1/,5 \ No newline at end of file diff --git a/L1/dockerfiles/crds/run.sh b/L1/dockerfiles/crds/run.sh new file mode 100644 index 0000000..d8713b8 --- /dev/null +++ b/L1/dockerfiles/crds/run.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# input=test202210/P01_N6397_030s_Astrometry-off/MSC_0000000/,test202210/P01_N6397_030s_Astrometry-off/MSC_0000000_L1/,4 +input=$1 +arr=($(echo $input | tr "," " ")) + +echo ${arr[0]} +echo ${arr[1]} +echo ${arr[2]} + +python /L1Pipeline/build/csst_l1/app/l1_mbi_local.py /share/OnOrbitCal/SimData/${arr[0]} /share/OnOrbitCal/SimData/${arr[1]} ${arr[2]} > /work/stdout 2> /work/stderr + +exit_code=$? + +# 标准错误和标准输出，输出到文件 +echo "input : " ${arr[1]} >> /var/log/scalebox/stdout +cat /work/stdout >> /var/log/scalebox/stdout + +echo "input : " ${arr[1]} >> /var/log/scalebox/stderr +cat /work/stderr >> /var/log/scalebox/stderr + +rm -f /work/stdout /work/stderr + +#创建临时文件 +touch /share/OnOrbitCal/SimData/${arr[1]}csst-l1mod-tmp.log +#取/L1Pipeline/L1/csst-l1mod.log后100行 +cat /share/OnOrbitCal/SimData/${arr[1]}csst-l1mod.log|tail -n 100 > /share/OnOrbitCal/SimData/${arr[1]}csst-l1mod-tmp.log +# log文件记录到标准错误或标准输出 +cat /share/OnOrbitCal/SimData/${arr[1]}csst-l1ppl.log /share/OnOrbitCal/SimData/${arr[1]}csst-l1mod-tmp.log +cat /share/OnOrbitCal/SimData/${arr[1]}csst-l1ppl.log /share/OnOrbitCal/SimData/${arr[1]}csst-l1mod-tmp.log >> /var/log/scalebox/${arr[1]}csst_l1.log + +echo finish crds. + +exit $exit_code \ No newline at end of file diff --git a/L1/dockerfiles/crds/test/Makefile b/L1/dockerfiles/crds/test/Makefile new file mode 100644 index 0000000..2024898 --- /dev/null +++ b/L1/dockerfiles/crds/test/Makefile @@ -0,0 +1,16 @@ +CLUSTER=csst + +all: reset build + +run: + scalebox app create + +reset: + cd ${HOME}/docker-scalebox/clusters/$(CLUSTER) && make && cd - + +down: + make -C ${HOME}/docker-scalebox/clusters/$(CLUSTER) down + +list: + make -C ${HOME}/docker-scalebox/clusters/$(CLUSTER) list + diff --git a/L1/dockerfiles/crds/test/app.yaml b/L1/dockerfiles/crds/test/app.yaml new file mode 100644 index 0000000..6728bac --- /dev/null +++ b/L1/dockerfiles/crds/test/app.yaml @@ -0,0 +1,41 @@ +name: crds.app.process +label: csst-crds +cluster: csst +parameters: + initial_status: RUNNING + +jobs: + # redis-cli: + # label: 消息队列接受模块 + # base_image: csst/redis-cli + # schedule_mode: HEAD + # # parameters: + # # start_message: abcd + # sink_jobs: + # - crds + # admL1: + # label: 1级流水线消息网关 + # base_image: csst/adml1 + # schedule_mode: HEAD + # # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% + # sink_jobs: + # - crds + crds: + label: CRDS定标天区 + base_image: csst/crds +# schedule_mode: HEAD + paths: + - /sharewcl/L1Pipeline/aux:/L1Pipeline/aux + - /sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr:/L1Pipeline/aux/C6.1_ref_crds + - /sharewcl/dfs:/dfsroot + - /sharewcl:/share + # sink_jobs: + hosts: + # - h0:1 + - c0:3 + - c1:3 + - c2:3 + + + + diff --git a/L1/dockerfiles/mbi/Dockerfile b/L1/dockerfiles/mbi/Dockerfile index f2e39d1..5a0245a 100644 --- a/L1/dockerfiles/mbi/Dockerfile +++ b/L1/dockerfiles/mbi/Dockerfile @@ -7,4 +7,4 @@ COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin RUN mkdir /work/ WORKDIR /work/ -ENTRYPOINT ["goagent"] \ No newline at end of file +ENTRYPOINT ["goagent"] diff --git a/L1/dockerfiles/mbi/run.sh b/L1/dockerfiles/mbi/run.sh index 69b5fa9..79c1582 100644 --- a/L1/dockerfiles/mbi/run.sh +++ b/L1/dockerfiles/mbi/run.sh @@ -1,11 +1,11 @@ #!/bin/bash # clear directories -rm -rf /L1Pipeline/L0/* -rm -rf /L1Pipeline/L1/* +#rm -rf /L1Pipeline/L0/* +#rm -rf /L1Pipeline/L1/* # obsid 100000100 ~ 100000154 -python /L1Pipeline/build/csst_l1/app/l1_mbi.py $1 > /work/stdout 2> /work/stderr +python /L1Pipeline/build/csst_l1/app/l1_mbi_tcc.py $1 > /work/stdout 2> /work/stderr exit_code=$? @@ -31,6 +31,31 @@ cat /L1Pipeline/L1/csst-l1ppl.log /L1Pipeline/L1/csst-l1mod-tmp.log >> /var/log/ rm -rf /L1Pipeline/L0/* /L1Pipeline/L1/* +# do timestamps +ts="" +if [ -f "/tmp/timestamps.txt" ]; then + mapfile arr < /tmp/timestamps.txt + for e in ${arr[@]}; do + # e=${e:0:-5} + # e+="+08:00" + # e=$(echo $e|tr ',' '.') + ts+=\"${e}\"\, + done + # skip the last ',' + ts=${ts:0:-1} + rm -f /tmp/timestamps.txt + +cat << EOF > /work/record.json +{ + "timestamps":[${ts}] +} +EOF + +fi + + + + echo finish mbi. -exit $exit_code \ No newline at end of file +exit $exit_code diff --git a/L1/dockerfiles/mbi/test/Makefile b/L1/dockerfiles/mbi/test/Makefile index 2024898..209cf32 100644 --- a/L1/dockerfiles/mbi/test/Makefile +++ b/L1/dockerfiles/mbi/test/Makefile @@ -3,7 +3,7 @@ CLUSTER=csst all: reset build run: - scalebox app create + scalebox app create --env-file tencent.env reset: cd ${HOME}/docker-scalebox/clusters/$(CLUSTER) && make && cd - diff --git a/L1/dockerfiles/mbi/test/app.yaml b/L1/dockerfiles/mbi/test/app.yaml index a5b4d2a..ff3da3a 100644 --- a/L1/dockerfiles/mbi/test/app.yaml +++ b/L1/dockerfiles/mbi/test/app.yaml @@ -25,8 +25,12 @@ jobs: base_image: csst/mbi schedule_mode: HEAD paths: - - /sharewcl/L1Pipeline/aux:/L1Pipeline/aux - - /sharewcl/dfs:/dfsroot + # - /sharewcl/L1Pipeline/aux:/L1Pipeline/aux + # - /sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr:/L1Pipeline/aux/C6.1_ref_crds + # - /sharewcl/dfs:/dfsroot + - ${AUX_DIR}:/L1Pipeline/aux + - ${CRDS_DIR}:/L1Pipeline/aux/C6.1_ref_crds + - ${DFS_ROOT}:/dfsroot # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% # sink_jobs: hosts: @@ -39,9 +43,9 @@ jobs: base_image: csst/sls2d schedule_mode: HEAD paths: - - /sharewcl/L1Pipeline/aux:/L1Pipeline/aux - - /sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr:/L1Pipeline/aux/C6.1_ref_crds - - /sharewcl/dfs:/dfsroot + - ${AUX_DIR}:/L1Pipeline/aux + - ${CRDS_DIR}:/L1Pipeline/aux/C6.1_ref_crds + - ${DFS_ROOT}:/dfsroot # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% # sink_jobs: hosts: diff --git a/L1/dockerfiles/mbi/test/tencent.env b/L1/dockerfiles/mbi/test/tencent.env new file mode 100644 index 0000000..eea7702 --- /dev/null +++ b/L1/dockerfiles/mbi/test/tencent.env @@ -0,0 +1,3 @@ +AUX_DIR=/goosefsx/x_c60_o19xp6c1_proxy/L1Pipeline/aux +CRDS_DIR=/goosefsx/x_c60_o19xp6c1_proxy/L1Pipeline/aux/products_ref20_3hdr +DFS_ROOT=/goosefsx/x_c60_o19xp6c1_proxy/dfs_root diff --git a/L1/dockerfiles/mbi/test/zjs.env b/L1/dockerfiles/mbi/test/zjs.env new file mode 100644 index 0000000..1f64fd8 --- /dev/null +++ b/L1/dockerfiles/mbi/test/zjs.env @@ -0,0 +1,3 @@ +AUX_DIR=/sharewcl/L1Pipeline/aux +CRDS_DIR=/sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr +DFS_ROOT=/sharewcl/dfs diff --git a/L1/dockerfiles/module2/Dockerfile b/L1/dockerfiles/module2/Dockerfile index c15444d..84893d1 100644 --- a/L1/dockerfiles/module2/Dockerfile +++ b/L1/dockerfiles/module2/Dockerfile @@ -9,4 +9,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* COPY *.sh /app/bin/ -COPY *.py /app/bin/ \ No newline at end of file +COPY *.py /app/bin/ + +RUN cd /app/bin/ \ + && chmod +x run.sh diff --git a/L1/dockerfiles/redis-cli/Dockerfile b/L1/dockerfiles/redis-cli/Dockerfile index 71d8b46..e91e5e7 100644 --- a/L1/dockerfiles/redis-cli/Dockerfile +++ b/L1/dockerfiles/redis-cli/Dockerfile @@ -3,7 +3,8 @@ FROM hub.cstcloud.cn/scalebox/agent # 安装redis-cli RUN apt-get update \ && apt-get install -y redis -ENV REDIS_SERVER=192.169.23.2 +ENV REDIS_SERVER=10.0.0.9 +#ENV REDIS_SERVER=192.169.23.2 COPY run.sh /app/bin/ RUN chmod +x /app/bin/run.sh diff --git a/L1/dockerfiles/sls2d/Dockerfile b/L1/dockerfiles/sls2d/Dockerfile index 12b56b9..822654c 100644 --- a/L1/dockerfiles/sls2d/Dockerfile +++ b/L1/dockerfiles/sls2d/Dockerfile @@ -1,5 +1,4 @@ -FROM csst-l1ppl:6.0.137 - +FROM csst-l1ppl:latest COPY run.sh /app/bin/ RUN chmod +x /app/bin/run.sh diff --git a/L1/dockerfiles/sls2d/Makefile b/L1/dockerfiles/sls2d/Makefile index fe8212e..876f26c 100644 --- a/L1/dockerfiles/sls2d/Makefile +++ b/L1/dockerfiles/sls2d/Makefile @@ -1,17 +1,17 @@ IMAGE_NAME:=csst/sls2d build: - docker build --network=host -t $(IMAGE_NAME) . + 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) > /share/tmp/sls2d.tar - ssh c0 docker load -i /share/tmp/sls2d.tar - ssh c1 docker load -i /share/tmp/sls2d.tar - ssh c2 docker load -i /share/tmp/sls2d.tar + docker save $(IMAGE_NAME) > /share/tmp/sls2d.tar + ssh c0 docker load -i /share/tmp/sls2d.tar + ssh c1 docker load -i /share/tmp/sls2d.tar + ssh c2 docker load -i /share/tmp/sls2d.tar push: - docker push $(IMAGE_NAME) + docker push $(IMAGE_NAME) run: - docker run -it --entrypoint bash $(IMAGE_NAME) + docker run -it --entrypoint bash $(IMAGE_NAME) down: - docker stop $(IMAGE_NAME) + docker stop $(IMAGE_NAME) diff --git a/L1/dockerfiles/sls2d/run.sh b/L1/dockerfiles/sls2d/run.sh index 1336b15..56e46a7 100644 --- a/L1/dockerfiles/sls2d/run.sh +++ b/L1/dockerfiles/sls2d/run.sh @@ -5,7 +5,7 @@ rm -rf /L1Pipeline/L0/* rm -rf /L1Pipeline/L1/* # obsid 100000100 ~ 100000154 -python /L1Pipeline/build/csst_l1/app/l1_sls2d.py $1 > /work/stdout 2> /work/stderr +python /L1Pipeline/build/csst_l1/app/l1_sls2d_tcc.py $1 > /work/stdout 2> /work/stderr exit_code=$? @@ -31,6 +31,28 @@ cat /L1Pipeline/L1/csst-l1ppl.log /L1Pipeline/L1/csst-l1mod-tmp.log >> /var/log/ rm -rf /L1Pipeline/L0/* /L1Pipeline/L1/* +# do timestamps +ts="" +if [ -f "/tmp/timestamps.txt" ]; then + mapfile arr < /tmp/timestamps.txt + for e in ${arr[@]}; do + #e=${e:0:-5} + #e+="+08:00" + #e=$(echo $e|tr ',' '.') + ts+=\"${e}\"\, + done + # skip the last ',' + ts=${ts:0:-1} + rm -f /tmp/timestamps.txt + +cat << EOF > /work/record.json +{ + "timestamps":[${ts}] +} +EOF + +fi + echo finish sls2d. exit $exit_code diff --git a/L1/dockerfiles/sls2d/test/add_tasks.sh b/L1/dockerfiles/sls2d/test/add_tasks.sh new file mode 100644 index 0000000..fab6d7c --- /dev/null +++ b/L1/dockerfiles/sls2d/test/add_tasks.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +POSTGRES_USER=scalebox +POSTGRES_HOST=localhost +POSTGRES_DB=scalebox +PGPORT=5432 + +job_id=45 + +for m in {100000020..100000154}; do + echo $m +psql -U ${POSTGRES_USER} -h ${POSTGRES_HOST} -d ${POSTGRES_DB} -p ${PGPORT} << EOF +INSERT INTO t_task(job,key_message) VALUES(${job_id},'${m}'); +EOF + +done + diff --git a/L1/dockerfiles/sls2d/test/app.yaml b/L1/dockerfiles/sls2d/test/app.yaml index ea2e2db..61e0832 100644 --- a/L1/dockerfiles/sls2d/test/app.yaml +++ b/L1/dockerfiles/sls2d/test/app.yaml @@ -9,17 +9,20 @@ jobs: label: 无缝光谱2D base_image: csst/sls2d schedule_mode: HEAD - variables: - repeated: yes - parameters: - start_message: 100000100 +# variables: +# repeated: yes +# parameters: +# start_message: 100000100 paths: - - /sharewcl/L1Pipeline/aux:/L1Pipeline/aux - - /sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr:/L1Pipeline/aux/C6.1_ref_crds - - /sharewcl/dfs:/dfsroot + - /goosefsx/x_c60_o19xp6c1_proxy/L1Pipeline/aux:/L1Pipeline/aux + - /goosefsx/x_c60_o19xp6c1_proxy/L1Pipeline/aux/products_ref20_3hdr:/L1Pipeline/aux/C6.1_ref_crds + - /goosefsx/x_c60_o19xp6c1_proxy/dfs_root:/dfsroot + # - /sharewcl/L1Pipeline/aux:/L1Pipeline/aux + # - /sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr:/L1Pipeline/aux/C6.1_ref_crds + # - /sharewcl/dfs:/dfsroot # sink_jobs: - # hosts: + # hosts: # - h0:1 - # - c0:1 - # - c1:1 - # - c2:1 + # - c0:3 + # - c1:3 + # - c2:3 -- GitLab