Remove "forcedWorkspaceCleanup" option
It is superseded by the CreateWorkspace() function and task step (which removes and recreates a workspace), and this option was not actually used in any function except for the build of unit tests, but no XML step actually specified this option.
This commit is contained in:
@@ -70,7 +70,6 @@ def OC_logout(cmd):
|
|||||||
class Cluster:
|
class Cluster:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.eNBSourceCodePath = ""
|
self.eNBSourceCodePath = ""
|
||||||
self.forcedWorkspaceCleanup = False
|
|
||||||
self.OCUserName = ""
|
self.OCUserName = ""
|
||||||
self.OCPassword = ""
|
self.OCPassword = ""
|
||||||
self.OCProjectName = ""
|
self.OCProjectName = ""
|
||||||
|
|||||||
@@ -231,7 +231,6 @@ class Containerize():
|
|||||||
self.ranCommitID = ''
|
self.ranCommitID = ''
|
||||||
self.ranTargetBranch = ''
|
self.ranTargetBranch = ''
|
||||||
self.eNBSourceCodePath = ''
|
self.eNBSourceCodePath = ''
|
||||||
self.forcedWorkspaceCleanup = False
|
|
||||||
self.imageKind = ''
|
self.imageKind = ''
|
||||||
self.proxyCommit = None
|
self.proxyCommit = None
|
||||||
self.yamlPath = ''
|
self.yamlPath = ''
|
||||||
@@ -544,9 +543,6 @@ class Containerize():
|
|||||||
raise Exception("Can build unit tests only on Ubuntu server")
|
raise Exception("Can build unit tests only on Ubuntu server")
|
||||||
logging.debug('running on Ubuntu as expected')
|
logging.debug('running on Ubuntu as expected')
|
||||||
|
|
||||||
if self.forcedWorkspaceCleanup:
|
|
||||||
cmd.run(f'sudo -S rm -Rf {lSourcePath}')
|
|
||||||
|
|
||||||
# check that ran-base image exists as we expect it
|
# check that ran-base image exists as we expect it
|
||||||
baseImage = 'ran-base'
|
baseImage = 'ran-base'
|
||||||
baseTag = 'develop'
|
baseTag = 'develop'
|
||||||
|
|||||||
@@ -102,14 +102,6 @@ def ExecuteActionWithParam(action, ctx):
|
|||||||
if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
|
if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
|
||||||
RAN.Build_eNB_args=test.findtext('Build_eNB_args')
|
RAN.Build_eNB_args=test.findtext('Build_eNB_args')
|
||||||
CONTAINERS.imageKind=test.findtext('kind')
|
CONTAINERS.imageKind=test.findtext('kind')
|
||||||
forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
|
|
||||||
RAN.Build_eNB_forced_workspace_cleanup=False
|
|
||||||
CONTAINERS.forcedWorkspaceCleanup=False
|
|
||||||
CLUSTER.forcedWorkspaceCleanup = False
|
|
||||||
if forced_workspace_cleanup is not None and re.match('true', forced_workspace_cleanup, re.IGNORECASE):
|
|
||||||
RAN.Build_eNB_forced_workspace_cleanup = True
|
|
||||||
CONTAINERS.forcedWorkspaceCleanup = True
|
|
||||||
CLUSTER.forcedWorkspaceCleanup = True
|
|
||||||
node = test.findtext('node')
|
node = test.findtext('node')
|
||||||
proxy_commit = test.findtext('proxy_commit')
|
proxy_commit = test.findtext('proxy_commit')
|
||||||
if proxy_commit is not None:
|
if proxy_commit is not None:
|
||||||
|
|||||||
@@ -41,7 +41,6 @@
|
|||||||
<desc>Build all Images</desc>
|
<desc>Build all Images</desc>
|
||||||
<node>obelix</node>
|
<node>obelix</node>
|
||||||
<kind>all</kind>
|
<kind>all</kind>
|
||||||
<forced_workspace_cleanup>True</forced_workspace_cleanup>
|
|
||||||
</testCase>
|
</testCase>
|
||||||
|
|
||||||
<testCase id="000010">
|
<testCase id="000010">
|
||||||
|
|||||||
@@ -39,7 +39,6 @@
|
|||||||
<desc>Cross-Compile for ARM64</desc>
|
<desc>Cross-Compile for ARM64</desc>
|
||||||
<kind>build_cross_arm64</kind>
|
<kind>build_cross_arm64</kind>
|
||||||
<node>alambix</node>
|
<node>alambix</node>
|
||||||
<forced_workspace_cleanup>True</forced_workspace_cleanup>
|
|
||||||
</testCase>
|
</testCase>
|
||||||
|
|
||||||
</testCaseList>
|
</testCaseList>
|
||||||
|
|||||||
@@ -33,7 +33,6 @@
|
|||||||
<class>Build_Proxy</class>
|
<class>Build_Proxy</class>
|
||||||
<desc>Build L2sim Proxy Image</desc>
|
<desc>Build L2sim Proxy Image</desc>
|
||||||
<node>localhost</node>
|
<node>localhost</node>
|
||||||
<forced_workspace_cleanup>True</forced_workspace_cleanup>
|
|
||||||
<proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
|
<proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
|
||||||
</testCase>
|
</testCase>
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
<desc>Build gNB (USRP)</desc>
|
<desc>Build gNB (USRP)</desc>
|
||||||
<node>caracal</node>
|
<node>caracal</node>
|
||||||
<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
|
<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib ldpc_cuda --build-lib ldpc_aal --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
|
||||||
<forced_workspace_cleanup>True</forced_workspace_cleanup>
|
|
||||||
</testCase>
|
</testCase>
|
||||||
|
|
||||||
<testCase id="100000">
|
<testCase id="100000">
|
||||||
|
|||||||
Reference in New Issue
Block a user