Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
csst
Scalebox Apps
Commits
fe641370
Commit
fe641370
authored
Aug 11, 2023
by
Zhang Xiaoli
Browse files
modify admL1 to adm-L1, the method of getting job-id is different.
parent
0a669f09
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
11 additions
and
10 deletions
+11
-10
L1/dockerfiles/adm-L1/Dockerfile
L1/dockerfiles/adm-L1/Dockerfile
+0
-0
L1/dockerfiles/adm-L1/Makefile
L1/dockerfiles/adm-L1/Makefile
+2
-2
L1/dockerfiles/adm-L1/admL1.py
L1/dockerfiles/adm-L1/admL1.py
+0
-0
L1/dockerfiles/adm-L1/control.proto
L1/dockerfiles/adm-L1/control.proto
+0
-0
L1/dockerfiles/adm-L1/init.py
L1/dockerfiles/adm-L1/init.py
+0
-0
L1/dockerfiles/adm-L1/mgL1.py
L1/dockerfiles/adm-L1/mgL1.py
+9
-8
L1/dockerfiles/adm-L1/mgL1old.py
L1/dockerfiles/adm-L1/mgL1old.py
+0
-0
L1/dockerfiles/adm-L1/obs.sql
L1/dockerfiles/adm-L1/obs.sql
+0
-0
L1/dockerfiles/adm-L1/run.sh
L1/dockerfiles/adm-L1/run.sh
+0
-0
L1/dockerfiles/adm-L1/test.py
L1/dockerfiles/adm-L1/test.py
+0
-0
No files found.
L1/dockerfiles/admL1/Dockerfile
→
L1/dockerfiles/adm
-
L1/Dockerfile
View file @
fe641370
File moved
L1/dockerfiles/admL1/Makefile
→
L1/dockerfiles/adm
-
L1/Makefile
View file @
fe641370
IMAGE_NAME
:=
csst/adml1
IMAGE_NAME
:=
csst/adm
-
l1
build
:
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
...
...
@@ -13,4 +13,4 @@ run:
down
:
docker stop
$(IMAGE_NAME)
scp
:
scp
-r
./ csst-zjs:/root/csst/admL1/
\ No newline at end of file
scp
-r
./ csst-zjs:/root/csst/adm-L1/
\ No newline at end of file
L1/dockerfiles/admL1/admL1.py
→
L1/dockerfiles/adm
-
L1/admL1.py
View file @
fe641370
File moved
L1/dockerfiles/admL1/control.proto
→
L1/dockerfiles/adm
-
L1/control.proto
View file @
fe641370
File moved
L1/dockerfiles/admL1/init.py
→
L1/dockerfiles/adm
-
L1/init.py
View file @
fe641370
File moved
L1/dockerfiles/admL1/mgL1.py
→
L1/dockerfiles/adm
-
L1/mgL1.py
View file @
fe641370
...
...
@@ -22,14 +22,15 @@ class admL1Api():
#取环境变量中模块id,需预先设定
#current_job_id=os.getenv('CSST_ADML1_APPID')
# conn = psycopg2.connect(host="10.255.2.12",port=5433,user="scalebox",password="changeme",database="scalebox")
conn
=
psycopg2
.
connect
(
host
=
shost
,
port
=
sport
,
user
=
suser
,
password
=
spwd
,
database
=
sdb
)
cursor
=
conn
.
cursor
()
#sql ="SELECT id,name FROM t_app ;"
#根据admL1的名字查找它的jobid
admsql
=
"SELECT id FROM t_job where name = 'admL1'"
cursor
.
execute
(
admsql
)
admrows
=
cursor
.
fetchone
()
current_job_id
=
admrows
[
0
]
# conn = psycopg2.connect(host=shost,port=sport,user=suser,password=spwd,database=sdb)
# cursor = conn.cursor()
# #sql ="SELECT id,name FROM t_app ;"
# #根据admL1的名字查找它的jobid
# admsql = "SELECT id FROM t_job where name = 'adm-L1'"
# cursor.execute(admsql)
# admrows = cursor.fetchone()
# current_job_id = admrows[0]
current_job_id
=
os
.
getenv
(
'JOB_ID'
)
sink_job_name
=
""
if
obsid
==
1
:
admL1Api
.
sum_numbers
(
body
,
"msc-l1-mbi"
,
current_job_id
)
...
...
L1/dockerfiles/admL1/mgL1old.py
→
L1/dockerfiles/adm
-
L1/mgL1old.py
View file @
fe641370
File moved
L1/dockerfiles/admL1/obs.sql
→
L1/dockerfiles/adm
-
L1/obs.sql
View file @
fe641370
File moved
L1/dockerfiles/admL1/run.sh
→
L1/dockerfiles/adm
-
L1/run.sh
View file @
fe641370
File moved
L1/dockerfiles/admL1/test.py
→
L1/dockerfiles/adm
-
L1/test.py
View file @
fe641370
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment