diff --git a/L2/dockerfiles/admL2/Dockerfile b/L2/dockerfiles/admL2/Dockerfile index 2c1cc7137d22ad2d39d57d60e89ab59618427a19..bf5ab43f9cbde6224ec87a358bcb905c847efaff 100644 --- a/L2/dockerfiles/admL2/Dockerfile +++ b/L2/dockerfiles/admL2/Dockerfile @@ -22,5 +22,5 @@ RUN cd /app/bin/ \ && mkdir controld \ && python3 -m grpc_tools.protoc --python_out=. --grpc_python_out=. -I. control.proto -I=control -ENV CSST_ADML2_JOB_ID="12" \ - CSST_PIPELINE_GRPC_SERVER="10.255.2.11:50051" \ No newline at end of file +ENV CSST_ADML2_JOB_ID="3" \ + CSST_PIPELINE_GRPC_SERVER="122.96.144.152:39092" \ No newline at end of file diff --git a/L2/pipelines/Makefile b/L2/pipelines/Makefile index 535dee092a1c698e86e552662f7d89059c833d59..9bfe303c1ff830dcd1b78f505408b9a423e71365 100644 --- a/L2/pipelines/Makefile +++ b/L2/pipelines/Makefile @@ -10,7 +10,7 @@ up-app: parse: CLUSTER=$(CLUSTER) \ - ${HOME}/docker-scalebox/bin/parse.sh app.yaml + scalebox app create app.yaml start: docker run -it --rm --network host -e JOB_ID=17 -e GRPC_SERVER=localhost:50051 hub.cstcloud.cn/scalebox/base bash -c ' send-job-message filelist . ' diff --git a/L2/pipelines/app.yaml b/L2/pipelines/app.yaml index c9aaf49c859467f020f969de5bff9ea6ff5b8156..28465de0fffb0ac33c7198f93d67f462507cd7e9 100644 --- a/L2/pipelines/app.yaml +++ b/L2/pipelines/app.yaml @@ -1,43 +1,60 @@ -name: csst-1.app.process -label: csst-adminL1 -output_basedir: /data/csst-adminL1 +name: csst.app.process +label: csst-admin +output_basedir: /data/csst-admin cluster: csst +parameters: + initial_status: RUNNING jobs: - admL1: - label: admin管理模块1 - base_image: hub.cstcloud.cn/csst/adml1:dev + admL2: + label: admin管理模块 + base_image: hub.cstcloud.cn/csst/adml2:dev type: LONG-RUN-JOB schedule_mode: HEAD + #parameters: + # start_message: brickid,name1,name2 ## key_example: Dec+5841_09_04/20200817 key_group_regex: ^(Dec.+/[0-9]+)$ -# environments: + # environments: # - RSYNC_SRC=scalebox@159.226.237.136 -# - ROOT_PATH=${ROOT_PATH} + # - ROOT_PATH=${ROOT_PATH} # - REGEX_FILTER=^.+_000[0-7]_2bit.fits$ command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% sink_jobs: - - module1 - #- module2 - module1: + - name1 + - name2 + # - name3 + name1: label: 模块一 - base_image: hub.cstcloud.cn/csst/module1:dev + base_image: hub.cstcloud.cn/csst/name1:dev type: LONG-RUN-JOB schedule_mode: HEAD ## key_example: Dec+5841_09_04/20200817 key_group_regex: ^(Dec.+/[0-9]+)$ -# paths: -# - ${ROOT_PATH}:${ROOT_PATH}:ro -# environments: + # environments: # - RSYNC_SRC=scalebox@159.226.237.136 -# - ROOT_PATH=${ROOT_PATH} + # - ROOT_PATH=${ROOT_PATH} # - REGEX_FILTER=^.+_000[0-7]_2bit.fits$ command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% - # sink_jobs: - # - admL1 - # module2: - # label: 模块二 - # base_image: hub.cstcloud.cn/csst/module2:dev + sink_jobs: + - admL2 + name2: + label: 模块二 + base_image: hub.cstcloud.cn/csst/name2:dev + type: LONG-RUN-JOB + schedule_mode: HEAD + ## key_example: Dec+5841_09_04/20200817 + key_group_regex: ^(Dec.+/[0-9]+)$ + # environments: + # - RSYNC_SRC=scalebox@159.226.237.136 + # - ROOT_PATH=${ROOT_PATH} + # - REGEX_FILTER=^.+_000[0-7]_2bit.fits$ + command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% + sink_jobs: + - admL2 + # name3: + # label: 模块三 + # #base_image: hub.cstcloud.cn/csst/name3 # type: LONG-RUN-JOB # schedule_mode: HEAD # ## key_example: Dec+5841_09_04/20200817 @@ -48,8 +65,7 @@ jobs: # # - RSYNC_SRC=scalebox@159.226.237.136 # - ROOT_PATH=${ROOT_PATH} # # - REGEX_FILTER=^.+_000[0-7]_2bit.fits$ - # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% - # # sink_jobs: - # # - admL1 - + # # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE% + # sink_jobs: + # - admL2