Commit 6233667d authored by Robert Schmidt's avatar Robert Schmidt

Push_Local_Registry(): pass node

parent 7839d066
...@@ -627,10 +627,10 @@ class Containerize(): ...@@ -627,10 +627,10 @@ class Containerize():
HTML.CreateHtmlTabFooter(False) HTML.CreateHtmlTabFooter(False)
return False return False
def Push_Image_to_Local_Registry(self, HTML, svr_id, tag_prefix=""): def Push_Image_to_Local_Registry(self, node, HTML, tag_prefix=""):
lIpAddr, lSourcePath = self.GetCredentials(svr_id) lSourcePath = self.eNBSourceCodePath
logging.debug('Pushing images to server: ' + lIpAddr) logging.debug('Pushing images to server: ' + node)
ssh = cls_cmd.getConnection(lIpAddr) ssh = cls_cmd.getConnection(node)
imagePrefix = 'porcepix.sboai.cs.eurecom.fr' imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}') ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
if ret.returncode != 0: if ret.returncode != 0:
......
...@@ -343,9 +343,9 @@ def ExecuteActionWithParam(action, ctx): ...@@ -343,9 +343,9 @@ def ExecuteActionWithParam(action, ctx):
success = SCA.CppCheckAnalysis(ctx, HTML) success = SCA.CppCheckAnalysis(ctx, HTML)
elif action == 'Push_Local_Registry': elif action == 'Push_Local_Registry':
svr_id = test.findtext('svr_id') node = test.findtext('node')
tag_prefix = test.findtext('tag_prefix') or "" tag_prefix = test.findtext('tag_prefix') or ""
success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id, tag_prefix) success = CONTAINERS.Push_Image_to_Local_Registry(node, HTML, tag_prefix)
elif action == 'Pull_Local_Registry' or action == 'Clean_Test_Server_Images': elif action == 'Pull_Local_Registry' or action == 'Clean_Test_Server_Images':
if force_local: if force_local:
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<testCase id="000010"> <testCase id="000010">
<class>Push_Local_Registry</class> <class>Push_Local_Registry</class>
<desc>Push Images to Local Registry</desc> <desc>Push Images to Local Registry</desc>
<svr_id>0</svr_id> <node>obelix</node>
</testCase> </testCase>
</testCaseList> </testCaseList>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<testCase id="000010"> <testCase id="000010">
<class>Push_Local_Registry</class> <class>Push_Local_Registry</class>
<desc>Push Images to Local Registry</desc> <desc>Push Images to Local Registry</desc>
<svr_id>0</svr_id> <node>gracehopper3-oai</node>
<tag_prefix>arm_</tag_prefix> <tag_prefix>arm_</tag_prefix>
</testCase> </testCase>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment