From 60b9649e0017630a659c2d59c273becdbb9d9922 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 26 Sep 2024 19:22:47 +0200
Subject: [PATCH] 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                | 47 +++++--------------
 ci-scripts/cls_static_code_analysis.py        |  1 -
 ci-scripts/scripts/create_workspace.sh        | 25 ++++++++++
 ci-scripts/xml_files/cluster_image_build.xml  |  2 +-
 .../xml_files/container_4g_l2sim_proxy.xml    |  2 +-
 .../xml_files/container_4g_l2sim_tdd.xml      |  2 +-
 .../container_4g_rfsim_fdd_05MHz.xml          |  2 +-
 .../container_4g_rfsim_fdd_05MHz_noS1.xml     |  2 +-
 .../container_4g_rfsim_fdd_10MHz.xml          |  2 +-
 .../container_4g_rfsim_fdd_20MHz.xml          |  2 +-
 .../xml_files/container_4g_rfsim_fembms.xml   |  2 +-
 .../xml_files/container_4g_rfsim_mbms.xml     |  2 +-
 .../container_4g_rfsim_tdd_05MHz.xml          |  2 +-
 .../xml_files/container_5g_e1_rfsim.xml       |  2 +-
 .../xml_files/container_5g_f1_rfsim.xml       |  2 +-
 .../xml_files/container_5g_fdd_rfsim.xml      |  2 +-
 .../xml_files/container_5g_l2sim_tdd.xml      |  2 +-
 ci-scripts/xml_files/container_5g_rfsim.xml   |  2 +-
 .../xml_files/container_5g_rfsim_24prb.xml    |  2 +-
 .../xml_files/container_5g_rfsim_2x2.xml      |  2 +-
 .../container_5g_rfsim_f1_accelleran.xml      |  2 +-
 .../container_5g_rfsim_fdd_phytest.xml        |  2 +-
 .../container_5g_rfsim_fr2_32prb.xml          |  2 +-
 .../xml_files/container_5g_rfsim_ntn_geo.xml  |  2 +-
 .../xml_files/container_5g_rfsim_sidelink.xml |  2 +-
 .../xml_files/container_5g_rfsim_tdd_dora.xml |  2 +-
 .../xml_files/container_5g_rfsim_u0_25prb.xml |  2 +-
 .../xml_files/container_image_build.xml       |  2 +-
 .../xml_files/container_image_build_cross.xml |  2 +-
 .../xml_files/container_l2sim_proxy.xml       |  2 +-
 .../container_lte_b200_fdd_05Mhz_tm1.xml      |  2 +-
 ...container_lte_b200_fdd_05Mhz_tm1_if4_5.xml |  2 +-
 ...lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml |  2 +-
 .../container_lte_b200_fdd_10Mhz_tm1.xml      |  2 +-
 .../container_lte_b200_fdd_10Mhz_tm1_cdrx.xml |  2 +-
 ...container_lte_b200_fdd_10Mhz_tm1_oaiue.xml |  4 +-
 .../container_lte_b200_fdd_20Mhz_tm1.xml      |  2 +-
 .../container_lte_b200_tdd_05Mhz_tm1.xml      |  2 +-
 ...container_lte_b200_tdd_05Mhz_tm1_if4_5.xml |  2 +-
 .../container_lte_b200_tdd_05Mhz_tm2.xml      |  2 +-
 .../container_lte_b200_tdd_10Mhz_tm1.xml      |  2 +-
 .../container_lte_b200_tdd_20Mhz_tm1.xml      |  2 +-
 ...e_b200_tdd_20Mhz_tm1_default_scheduler.xml |  2 +-
 .../container_lte_n3xx_tdd_2x2_tm1.xml        |  2 +-
 .../container_lte_n3xx_tdd_2x2_tm2.xml        |  2 +-
 .../xml_files/container_nsa_b200_quectel.xml  |  4 +-
 .../xml_files/container_sa_aerial_quectel.xml |  2 +-
 .../xml_files/container_sa_aw2s_asue.xml      |  2 +-
 .../xml_files/container_sa_b200_quectel.xml   |  2 +-
 .../container_sa_e1_b200_quectel.xml          |  2 +-
 .../container_sa_f1_b200_quectel.xml          |  2 +-
 .../xml_files/container_sa_fhi72_vvdn_up2.xml |  2 +-
 .../container_sa_n310_2X2_100MHz_quectel.xml  |  2 +-
 .../container_sa_n310_2X2_60MHz_quectel.xml   |  2 +-
 .../xml_files/container_sa_n310_nrue.xml      |  4 +-
 .../container_sa_sc_b200_quectel.xml          |  2 +-
 ci-scripts/xml_files/cppcheck.xml             |  2 +-
 ci-scripts/xml_files/gnb_usrp_build.xml       |  2 +-
 58 files changed, 95 insertions(+), 94 deletions(-)
 create mode 100755 ci-scripts/scripts/create_workspace.sh

diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index f1694c9855a..42bd62f8355 100644
--- a/ci-scripts/cls_containerize.py
+++ b/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()')
-
-	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
+		raise ValueError('Insufficient Parameter in CreateWorkspace(): need ranCommitID')
+
+	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
diff --git a/ci-scripts/cls_static_code_analysis.py b/ci-scripts/cls_static_code_analysis.py
index ab4283d5347..ed5867c4cbd 100644
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/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
diff --git a/ci-scripts/scripts/create_workspace.sh b/ci-scripts/scripts/create_workspace.sh
new file mode 100755
index 00000000000..0dd1f3aca7d
--- /dev/null
+++ b/ci-scripts/scripts/create_workspace.sh
@@ -0,0 +1,25 @@
+#!/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"
diff --git a/ci-scripts/xml_files/cluster_image_build.xml b/ci-scripts/xml_files/cluster_image_build.xml
index b389fa7e217..6810873b1c7 100644
--- a/ci-scripts/xml_files/cluster_image_build.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_l2sim_proxy.xml b/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
index 792f9939fb4..cd57a24b6a4 100644
--- a/ci-scripts/xml_files/container_4g_l2sim_proxy.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
index 28f55c6d683..97a0610efa9 100644
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
index c717ba87b9a..a60a8e2d4db 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
index 67f66d2e6ca..d5c67c9835b 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
index f04057d8bfc..50e53c8624e 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
index 449341e13eb..12bf5533ba6 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
index 7ef304e6481..48f740b873d 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
index 82361921387..4abf69fb3e5 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
index eb848271414..fa3c6862b71 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml
index fa8f47a558e..bf4cf6ec043 100644
--- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
index a246727da14..16c02050d2e 100644
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
index a1454ed8bd0..d3640da596d 100644
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
index aa9fd2ece98..c3e4662294a 100644
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml
index edc9f1f30f0..16eacb02c53 100644
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
index 92f853fa997..2e3bbf1d3ae 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
index 67b2273a68c..a18928cc80a 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml b/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
index 07df4a751ee..c8dc1cf9b2d 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
index 8d43480c8ee..10081b96068 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
index ee88b9de873..b29be08d21f 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml b/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
index 2a8147140d3..04bf430f036 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_ntn_geo.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml b/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
index f3be815e301..d42f8851bb1 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
index 3b48f7b9016..35834493cc9 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
index cb4a9cd9f75..38d88b7e5ee 100644
--- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_image_build.xml b/ci-scripts/xml_files/container_image_build.xml
index cde7c7ce609..58b3c00d5ea 100644
--- a/ci-scripts/xml_files/container_image_build.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_image_build_cross.xml b/ci-scripts/xml_files/container_image_build_cross.xml
index c8bc67e51f6..046ceb54138 100644
--- a/ci-scripts/xml_files/container_image_build_cross.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_l2sim_proxy.xml b/ci-scripts/xml_files/container_l2sim_proxy.xml
index 59b09d3ef50..ead040de825 100644
--- a/ci-scripts/xml_files/container_l2sim_proxy.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
index 607c1ebcdd3..00516269a61 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
index 53eec11f200..4ede8e072bb 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
index 669f46f2ec9..b9bc7f7a428 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
index 2aa378b2238..958e0a895ac 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
index 55653d6e4a4..60a9bd0c161 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
index cefa6cd5c1b..10cd2e89c14 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
index 61fa2dea110..510d0d3f2e5 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
index 76bd380f4f1..c8bcde980fc 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
index ec280240e06..22a86d1f575 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml b/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
index 9111f00365f..068d4521b27 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm2.xml
+++ b/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>  
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
index 7218dcc576d..570fffef714 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
index 4ed3e89e590..49826d782cc 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml b/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
index 9ae77ccec3e..8e47a61a487 100644
--- a/ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
index cfae0e6188d..d1444483014 100644
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
index 1df5ea169c3..50494d7778c 100644
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
index 7e831b24542..c745cb90aad 100644
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
index 43fdf4b65b2..3f49e5fa8d5 100644
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue.xml
index 3929687f1b9..0e4e967c52f 100644
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml
index 4776bd784e5..a683c07a035 100644
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
index 4e4eab92c17..563167a2ddc 100644
--- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
index 4cce964633e..36adc62777f 100644
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
index b81ef51d5ba..527bc70082f 100644
--- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
index c713e5a431d..6b7c8a92ec6 100644
--- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
index fc0baadaca4..c94c30a7b23 100644
--- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_n310_nrue.xml b/ci-scripts/xml_files/container_sa_n310_nrue.xml
index f00a452403a..a358bbf5f84 100644
--- a/ci-scripts/xml_files/container_sa_n310_nrue.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
index d0dc59f3ccf..6831be69495 100644
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/cppcheck.xml b/ci-scripts/xml_files/cppcheck.xml
index 6ec7a58e55d..18d8760b0d9 100644
--- a/ci-scripts/xml_files/cppcheck.xml
+++ b/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>
diff --git a/ci-scripts/xml_files/gnb_usrp_build.xml b/ci-scripts/xml_files/gnb_usrp_build.xml
index da0c321956a..81c49e87d91 100644
--- a/ci-scripts/xml_files/gnb_usrp_build.xml
+++ b/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">
-- 
GitLab