ifs,mci测试成功。

L1/dockerfiles/csst-ifs-l1-rss/Dockerfile

-FROM csst/csst-ifs-l1-rss:latest
-LABEL maintainer="Xiaoli Zhang<zhangxiaoli@cnic.cn>"
+FROM csu-harbor.csst.nao:10443/csst/csst-ifs-l1-rss:latest
 
 USER root
 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
+COPY --from=hub.cstcloud.cn/scalebox/agent /usr/local /usr/local
+
+RUN mkdir /work/ 
+RUN chown -R csst:csst /work
+RUN chown -R csst:csst /pipeline
+WORKDIR /work/
+
+USER csst
 
-# RUN mkdir /work/
-# WORKDIR /work/
-WORKDIR /L1Pipeline/workspace
-    
 ENTRYPOINT ["goagent"]
 
 

L1/dockerfiles/csst-ifs-l1-rss/Makefile

 IMAGE_NAME:=cnic/csst-ifs-l1-rss
-IMAGE_PATH:=/sharewcl/temp
+IMAGE_PATH:=/nfs/tmp/scalebox-images
 build:
+	docker pull csu-harbor.csst.nao:10443/csst/csst-ifs-l1-rss
 	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) > $(IMAGE_PATH)/ifs-l1-rss.tar
-	ssh c0 docker load -i $(IMAGE_PATH)/ifs-l1-rss.tar
-	ssh c1 docker load -i $(IMAGE_PATH)/ifs-l1-rss.tar
-	ssh c2 docker load -i $(IMAGE_PATH)/ifs-l1-rss.tar
-	ssh n0 docker load -i $(IMAGE_PATH)/ifs-l1-rss.tar
-	ssh n1 docker load -i $(IMAGE_PATH)/ifs-l1-rss.tar
+	ssh sc1 docker load -i $(IMAGE_PATH)/ifs-l1-rss.tar
+	ssh sc2 docker load -i $(IMAGE_PATH)/ifs-l1-rss.tar
+	ssh sc3 docker load -i $(IMAGE_PATH)/ifs-l1-rss.tar
+
 push:
 	docker push $(IMAGE_NAME)
 run:

L1/dockerfiles/csst-ifs-l1-rss/run.sh

 #!/bin/bash
-# obsid="30100000001"
 
-obsid=$1
+message=$1
+echo "message: "$message
 
-# python l1_pipeline_script_mci_shao_simdata.py $obsid > ./stdout
-#python /L1Pipeline/workspace/helloworld.py $obsid
-
-python l1_pipeline_script_ifs_rss_simdata.py $obsid
+cd /pipeline/output/
+python /pipeline/app/run.py $message
+# python l1_pipeline_script_ifs_rss_simdata.py $obsid
 
 exit_code=$?
 
-mkdir -p /work
-# echo "=====csst-l1-ifs-rss.log====" > /work/user-file.txt
-# cat /L1Pipeline/workspace/ifs/rss/proc_data/path_RSSlog.txt >> /work/user-file.txt
+echo "=====pipeline.log====" > /work/custom-out.txt
+cat /pipeline/output/pipeline.log >> /work/custom-out.txt
+
+echo "======module.log======" >> /work/custom-out.txt
+cat /pipeline/output/module.log|tail -n 100 >> /work/custom-out.txt
+
+
+timefile=/pipeline/output/timestamp.txt
+if test -f "$timefile"; then
+    echo "$timefile exist"
+    mv /pipeline/output/timestamp.txt /work/timestamps.txt
+fi
+
+rm -rf /pipeline/input/* /pipeline/output/*
 
-# rm -rf /L1Pipeline/L0/* /L1Pipeline/L1/*
+headers=$2
+pattern='"dag_run_id":"([^"]+)"'
+if [[ $headers =~ $pattern ]]; then
+    dag_run_id="${BASH_REMATCH[1]}"
+    echo "dag_run_id: $dag_run_id"
+else
+    # no dag_run_id in json
+    dag_run_id=""
+fi
 
-# mv /tmp/timestamps.txt /work/timestamps.txt
+echo "dag_run_id:$dag_run_id" >> /work/extra-attributes.txt
 
-echo finish ifs rss.
+if [ $exit_code -eq 0 ]; then  
+    # scalebox task add --header dag_run_id=${dag_run_id} --header repeatable=yes --upsert ${message}
+    echo "finish ifs-l1-rss."  
+else  
+    echo "finish ifs-l1-rss, exit_code: $exit_code"  
+fi
 
-exit_code=$?   
+exit $exit_code

L1/dockerfiles/csst-mci-l1/Dockerfile

-FROM csst/csst-mci-l1:latest
-
-LABEL maintainer="Xiaoli Zhang<zhangxiaoli@cnic.cn>"
+FROM csu-harbor.csst.nao:10443/csst/csst-mci-l1:latest
 
+USER root
 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
+COPY --from=hub.cstcloud.cn/scalebox/agent /usr/local /usr/local
 
-RUN mkdir /work/
+RUN mkdir /work/ 
+RUN chown -R csst:csst /work
+RUN chown -R csst:csst /pipeline
 WORKDIR /work/
-    
+
+USER csst
+
 ENTRYPOINT ["goagent"]
 
 

L1/dockerfiles/csst-mci-l1/Makefile

 IMAGE_NAME:=cnic/csst-mci-l1
-IMAGE_PATH:=/sharewcl/temp
+IMAGE_PATH:=/nfs/tmp/scalebox-images
 build:
+	docker pull csu-harbor.csst.nao:10443/csst/csst-mci-l1
 	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) > $(IMAGE_PATH)/mci-l1.tar
-	ssh c0 docker load -i $(IMAGE_PATH)/mci-l1.tar
-	ssh c1 docker load -i $(IMAGE_PATH)/mci-l1.tar
-	ssh c2 docker load -i $(IMAGE_PATH)/mci-l1.tar
-	ssh n0 docker load -i $(IMAGE_PATH)/mci-l1.tar
-	ssh n1 docker load -i $(IMAGE_PATH)/mci-l1.tar
+	ssh sc3 docker load -i $(IMAGE_PATH)/mci-l1.tar
+	ssh sc1 docker load -i $(IMAGE_PATH)/mci-l1.tar
+	ssh sc2 docker load -i $(IMAGE_PATH)/mci-l1.tar
+
 push:
 	docker push $(IMAGE_NAME)
 run:

L1/dockerfiles/csst-mci-l1/run.sh

 #!/bin/bash
 
+message=$1
+echo "message: "$message
 
-# obsid="30100000001"
+cd /pipeline/output/
+python /pipeline/app/run.py $message
+# python l1_pipeline_script_ifs_rss_simdata.py $obsid
 
-obsid=$1
+exit_code=$?
 
-python /L1Pipeline/workspace/l1_pipeline_script_mci_shao_simdata.py $obsid
+echo "=====pipeline.log====" > /work/custom-out.txt
+cat /pipeline/output/pipeline.log >> /work/custom-out.txt
 
-exit_code=$?
+echo "======module.log======" >> /work/custom-out.txt
+cat /pipeline/output/module.log|tail -n 100 >> /work/custom-out.txt
+
+
+timefile=/pipeline/output/timestamp.txt
+if test -f "$timefile"; then
+    echo "$timefile exist"
+    mv /pipeline/output/timestamp.txt /work/timestamps.txt
+fi
 
-mkdir -p /work
-# echo "=====csst-l1-ifs-rss.log====" > /work/user-file.txt
-# cat /L1Pipeline/workspace/ifs/rss/proc_data/path_RSSlog.txt >> /work/user-file.txt
+rm -rf /pipeline/input/* /pipeline/output/*
 
-# rm -rf /L1Pipeline/L0/* /L1Pipeline/L1/*
+headers=$2
+pattern='"dag_run_id":"([^"]+)"'
+if [[ $headers =~ $pattern ]]; then
+    dag_run_id="${BASH_REMATCH[1]}"
+    echo "dag_run_id: $dag_run_id"
+else
+    # no dag_run_id in json
+    dag_run_id=""
+fi
 
-# mv /tmp/timestamps.txt /work/timestamps.txt
+echo "dag_run_id:$dag_run_id" >> /work/extra-attributes.txt
 
-echo finish mci pipeline.
+if [ $exit_code -eq 0 ]; then  
+    # scalebox task add --header dag_run_id=${dag_run_id} --header repeatable=yes --upsert ${message}
+    echo "finish mci."  
+else  
+    echo "finish mci, exit_code: $exit_code"  
+fi
 
 exit $exit_code
 
 
+# python /L1Pipeline/workspace/l1_pipeline_script_mci_shao_simdata.py $obsid
+
+
+