Implement CreateWorkspace() through script, print dir in HTML

Use a script, which can be tested independently of CI code (by running
it on the host on which it will be used), and print the directory that
has been prepared in the HTML.  Also, in the description, use the
infinitive/imperative(?) of the verb to harmonize with other steps.

ci-scripts/cls_containerize.py

@@ -60,41 +60,21 @@ import cls_oaicitest
 #-----------------------------------------------------------
 IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72']
 
-def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
+def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
 		logging.error('need ranCommitID in CreateWorkspace()')
-		sys.exit('Insufficient Parameter in CreateWorkspace()')
+		raise ValueError('Insufficient Parameter in CreateWorkspace(): need ranCommitID')
 
-	sshSession.command(f'rm -rf {sourcePath}', '\$', 10)
-	sshSession.command('mkdir -p ' + sourcePath, '\$', 5)
-	(sshSession.cd(sourcePath) if isinstance(sshSession, cls_cmd.Cmd) else sshSession.command('cd ' + sourcePath, '\$', 5))
-	# Recent version of git (>2.20?) should handle missing .git extension # without problems
-	if ranTargetBranch == 'null':
-		ranTargetBranch = 'develop'
-	baseBranch = re.sub('origin/', '', ranTargetBranch)
-	sshSession.command(f'git clone --filter=blob:none -n -b {baseBranch} {ranRepository} .', '\$', 60)
-	if sshSession.getBefore().count('error') > 0 or sshSession.getBefore().count('error') > 0:
-		sys.exit('error during clone')
-	sshSession.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
-	sshSession.command('git config user.name "OAI Jenkins"', '\$', 5)
-
-	sshSession.command('mkdir -p cmake_targets/log', '\$', 5)
-	# if the commit ID is provided use it to point to it
-	sshSession.command(f'git checkout -f {ranCommitID}', '\$', 30)
-	if sshSession.getBefore().count(f'HEAD is now at {ranCommitID[:6]}') != 1:
-		sshSession.command('git log --oneline | head -n5', '\$', 5)
-		logging.error(f'problems during checkout, is at: {sshSession.getBefore()}')
-		return False
-	else:
-		logging.debug('successful checkout')
-	# if the branch is not develop, then it is a merge request and we need to do
-	# the potential merge. Note that merge conflicts should already been checked earlier
+	script = "scripts/create_workspace.sh"
+	options = f"{sourcePath} {ranRepository} {ranCommitID}"
 	if ranAllowMerge:
 		if ranTargetBranch == '':
 			ranTargetBranch = 'develop'
-		logging.debug(f'Merging with the target branch: {ranTargetBranch}')
-		sshSession.command(f'git merge --ff origin/{ranTargetBranch} -m "Temporary merge for CI"', '\$', 30)
-	return True
+		options += f" {ranTargetBranch}"
+	logging.info(f'execute "{script}" with options "{options}" on node {host}')
+	ret = cls_cmd.runScript(host, script, 90, options)
+	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
+	return ret.returncode == 0
 
 def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
 	shortCommit = ranCommitID[0:8]
@@ -1000,12 +980,9 @@ class Containerize():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		
-		logging.info(f"Running on server {lIpAddr}")
-		sshSession = cls_cmd.getConnection(lIpAddr)
-
-		success = CreateWorkspace(sshSession, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		success = CreateWorkspace(lIpAddr, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		if success:
-			HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {lSourcePath}"])
 		else:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["cannot create workspace"])
 		return success

ci-scripts/cls_static_code_analysis.py

@@ -45,7 +45,6 @@ from multiprocessing import Process, Lock, SimpleQueue
 import helpreadme as HELP
 import constants as CONST
 import cls_cmd
-from cls_containerize import CreateWorkspace
 
 #-----------------------------------------------------------
 # Class Declaration

ci-scripts/scripts/create_workspace.sh

+#!/bin/bash
+
+function die() {
+  echo $@
+  exit 1
+}
+
+[ $# -ge 3 -a $# -le 4 ] || die "usage: $0 <directory> <repository> <ref> [<merge-ref>]"
+
+set -ex
+
+dir=$1
+repo=$2
+ref=$3
+merge=$4
+
+rm -rf ${dir}
+git clone --filter=blob:none -n -b develop ${repo} ${dir}
+cd ${dir}
+git config user.email "jenkins@openairinterface.org"
+git config user.name "OAI Jenkins"
+git config advice.detachedHead false
+mkdir -p cmake_targets/log
+git checkout -f ${ref}
+[ -n "${merge}" ] && git merge --ff ${merge} -m "Temporary merge for CI"

ci-scripts/xml_files/cluster_image_build.xml

@@ -31,7 +31,7 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
 	<testCase id="000002">
 		<class>Create_Workspace</class>
-		<desc>Creating new Workspace</desc>
+		<desc>Create new Workspace</desc>
 	</testCase>
 	<testCase id="000001">
 		<class>Build_Cluster_Image</class>

ci-scripts/xml_files/container_4g_l2sim_proxy.xml

@@ -31,7 +31,7 @@
         <TestCaseExclusionList></TestCaseExclusionList>
         <testCase id="100001">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>1</eNB_instance>
                 <eNB_serverId>1</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_4g_l2sim_tdd.xml

@@ -49,7 +49,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

@@ -45,7 +45,7 @@
         <TestCaseExclusionList></TestCaseExclusionList>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

@@ -48,7 +48,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml

@@ -52,7 +52,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml

@@ -52,7 +52,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_4g_rfsim_fembms.xml

@@ -45,7 +45,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_4g_rfsim_mbms.xml

@@ -45,7 +45,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml

@@ -52,7 +52,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -45,7 +45,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -47,7 +47,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -47,7 +47,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_l2sim_tdd.xml

@@ -47,7 +47,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -62,7 +62,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -47,7 +47,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -47,7 +47,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml

@@ -44,7 +44,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -54,7 +54,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -45,7 +45,7 @@
 
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml

@@ -47,7 +47,7 @@
 
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_sidelink.xml

@@ -45,7 +45,7 @@
 
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -53,7 +53,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -47,7 +47,7 @@
         </testCase>
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_image_build.xml

@@ -33,7 +33,7 @@
 
 	<testCase id="800813">
 		<class>Create_Workspace</class>
-		<desc>Creating new Workspace for server 0</desc>
+		<desc>Create new Workspace for server 0</desc>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 	</testCase>

ci-scripts/xml_files/container_image_build_cross.xml

@@ -31,7 +31,7 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
 	<testCase id="100001">
 		<class>Create_Workspace</class>
-		<desc>Creating new Workspace</desc>
+		<desc>Create new Workspace</desc>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 	</testCase>

ci-scripts/xml_files/container_l2sim_proxy.xml

@@ -32,7 +32,7 @@
 
         <testCase id="100001">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace</desc>
+                <desc>Create new Workspace</desc>
                 <eNB_instance>1</eNB_instance>
                 <eNB_serverId>1</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -68,7 +68,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -67,7 +67,7 @@
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

@@ -60,7 +60,7 @@ Replaces xml_files/enb_usrp210_band7_test_05mhz_tm1_rrc_inactivity_no_flexran.xm
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -62,7 +62,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -61,7 +61,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml

@@ -86,7 +86,7 @@
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>
@@ -99,7 +99,7 @@
     </testCase>
     <testCase id="800814">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 1</desc>
+        <desc>Create new Workspace for server 1</desc>
         <eNB_instance>1</eNB_instance>
         <eNB_serverId>1</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -61,7 +61,7 @@ Replaces xml_files/enb_usrp210_band7_test_10mhz_tm1.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

@@ -69,7 +69,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm1.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml

@@ -67,7 +67,7 @@
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml

@@ -59,7 +59,7 @@ Replaces xml_files/enb_usrp210_band40_test_05mhz_tm2.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>  

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -60,7 +60,7 @@ Replaces xml_files/enb_usrp210_band40_test_10mhz_tm1.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml

@@ -60,7 +60,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -61,7 +61,7 @@ Replaces xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml
     </testCase>
     <testCase id="800813">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace for server 0</desc>
+        <desc>Create new Workspace for server 0</desc>
         <eNB_instance>0</eNB_instance>
         <eNB_serverId>0</eNB_serverId>
     </testCase>

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml

@@ -67,7 +67,7 @@
   </testCase>
   <testCase id="800833">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml

@@ -67,7 +67,7 @@
   </testCase>
   <testCase id="800833">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -126,7 +126,7 @@
 	</testCase>
 	<testCase id="800833">
 		<class>Create_Workspace</class>
-		<desc>Creating new Workspace</desc>
+		<desc>Create new Workspace</desc>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 	</testCase>
@@ -139,7 +139,7 @@
 	</testCase>
 	<testCase id="800834">
 		<class>Create_Workspace</class>
-		<desc>Creating new Workspace</desc>
+		<desc>Create new Workspace</desc>
 		<eNB_instance>1</eNB_instance>
 		<eNB_serverId>1</eNB_serverId>
 	</testCase>

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -49,7 +49,7 @@
 
         <testCase id="800813">
                 <class>Create_Workspace</class>
-                <desc>Creating new Workspace for server 0</desc>
+                <desc>Create new Workspace for server 0</desc>
                 <eNB_instance>0</eNB_instance>
                 <eNB_serverId>0</eNB_serverId>
         </testCase>

ci-scripts/xml_files/container_sa_aw2s_asue.xml

@@ -68,7 +68,7 @@
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -100,7 +100,7 @@
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace for server 0</desc>
+    <desc>Create new Workspace for server 0</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -84,7 +84,7 @@
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_sa_f1_b200_quectel.xml

@@ -83,7 +83,7 @@
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -60,7 +60,7 @@
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace for server 0</desc>
+    <desc>Create new Workspace for server 0</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

@@ -79,7 +79,7 @@
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

@@ -79,7 +79,7 @@
   </testCase>
   <testCase id="800813">
       <class>Create_Workspace</class>
-      <desc>Creating new Workspace</desc>
+      <desc>Create new Workspace</desc>
       <eNB_instance>0</eNB_instance>
       <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_sa_n310_nrue.xml

@@ -70,7 +70,7 @@
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>
@@ -83,7 +83,7 @@
   </testCase>
   <testCase id="800814">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>1</eNB_instance>
     <eNB_serverId>1</eNB_serverId>
   </testCase>

ci-scripts/xml_files/container_sa_sc_b200_quectel.xml

@@ -94,7 +94,7 @@
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
-    <desc>Creating new Workspace</desc>
+    <desc>Create new Workspace</desc>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>

ci-scripts/xml_files/cppcheck.xml

@@ -31,7 +31,7 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
     <testCase id="000002">
         <class>Create_Workspace</class>
-        <desc>Creating new Workspace</desc>
+        <desc>Create new Workspace</desc>
     </testCase>
 	<testCase id="000001">
 		<class>Cppcheck_Analysis</class>

ci-scripts/xml_files/gnb_usrp_build.xml

@@ -33,7 +33,7 @@
 
 	<testCase id="000000">
 		<class>Create_Workspace</class>
-		<desc>Creating new Workspace</desc>
+		<desc>Create new Workspace</desc>
 	</testCase>
 
 	<testCase id="010101">