From e06f46dc480a37209a31465b44b0cc8a9c68586a Mon Sep 17 00:00:00 2001
From: zxl <zhangxiaoli@cnic.cn>
Date: Tue, 11 Jul 2023 09:29:45 +0800
Subject: [PATCH] Completed sls2d unit test.

---
 L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile       |  1 +
 L1/dockerfiles/csst-msc-l1-sls2d/Makefile         |  4 +++-
 L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile    |  2 +-
 L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml    |  7 ++++---
 L1/dockerfiles/csst-msc-l1-sls2d/test/zjs-ztm.env | 12 ++++++++++++
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 L1/dockerfiles/csst-msc-l1-sls2d/test/zjs-ztm.env

diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile b/L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile
index 7c1450a..bbf3090 100644
--- a/L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile
+++ b/L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile
@@ -1,5 +1,6 @@
 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
diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/Makefile b/L1/dockerfiles/csst-msc-l1-sls2d/Makefile
index e6571b6..6538ad5 100644
--- a/L1/dockerfiles/csst-msc-l1-sls2d/Makefile
+++ b/L1/dockerfiles/csst-msc-l1-sls2d/Makefile
@@ -16,4 +16,6 @@ run:
 down:
 	docker stop $(IMAGE_NAME)
 scp:
-	scp -r ./ csst-zjs:/root/csst/sls2d/
\ No newline at end of file
+	scp -r ./ csst-zjs:/root/csst/csst-msc-l1-sls2d/
+save:
+	docker save $(IMAGE_NAME) > /sharewcl/temp/msc-l1-sls2d.tar
\ No newline at end of file
diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile b/L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile
index 0e709ce..65fefa3 100644
--- a/L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile
+++ b/L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile
@@ -3,7 +3,7 @@ CLUSTER=csst
 # all: reset build
 
 run:
-	scalebox app create --env-file zjs.env
+	scalebox app create --env-file zjs-ztm.env
 
 reset:
 	cd ${HOME}/docker-scalebox/clusters/$(CLUSTER) && make && cd -
diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml b/L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml
index d7fdb86..42d97a6 100644
--- a/L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml
+++ b/L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml
@@ -18,13 +18,14 @@ jobs:
       output_text_size: 100000
       text_tranc_mode: TAIL
       locale_mode: NONE
+      grpc_server: 172.24.23.6:50051
     parameters:
       key_group_regex: ^(.{6})(.{3})$
       key_group_seq: 1,2
     paths:
-      - ${AUX_DIR}:/pipeline/aux
-      - ${CRDS_DIR}:/L1Pipeline/aux/C6.1_ref_crds
-      - ${DFS_ROOT}:/dfsroot
+      - ${CSST_AUX_DIR}:/pipeline/aux
+      - ${CSST_DFS_ROOT}:/dfsroot
+      - ${CSST_CRDS_ROOT}:/crdsroot
     # sink_jobs:
     # hosts:
     #  - h0:1
diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/test/zjs-ztm.env b/L1/dockerfiles/csst-msc-l1-sls2d/test/zjs-ztm.env
new file mode 100644
index 0000000..b5c0ed1
--- /dev/null
+++ b/L1/dockerfiles/csst-msc-l1-sls2d/test/zjs-ztm.env
@@ -0,0 +1,12 @@
+# 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
+
+# VOLUMES ==================
+CSST_DFS_ROOT=/share/dfs
+CSST_CRDS_ROOT=/share/crdsdata/data
+CSST_AUX_DIR=/share/pipeline/aux
-- 
GitLab