Index: build/build.sh
===================================================================
diff -u -r83726d95fcac0db6152cd6f89a5ab35ec4251b42 -rcf760b2bdf0a3a82418a1312f03a77e32491bd03
--- build/build.sh	(.../build.sh)	(revision 83726d95fcac0db6152cd6f89a5ab35ec4251b42)
+++ build/build.sh	(.../build.sh)	(revision cf760b2bdf0a3a82418a1312f03a77e32491bd03)
@@ -99,16 +99,6 @@
     echo
 }
 
-getAlarmMapping()
-{
-  local currentDir=$(pwd)
-  echo "Path $PATH"
-  echo "Here $currentDir"
-  ./scripts/build/alarmMapping common/common/AlarmDefs.h application/sources/model/hd/alarm/MAlarmMapping.cpp
-
-  cp scripts/build/AlarmMapping.csv $REMOTE_DIR
-}
-
 function getManualCases()
 {
   # If this is a build only, there is no need to get the manual cases
@@ -356,8 +346,6 @@
 	
 fi
 
-getAlarmMapping
-
 # To report what cases have been tested manually
 getManualCases
 
Index: build/unittest.sh
===================================================================
diff -u -r83726d95fcac0db6152cd6f89a5ab35ec4251b42 -rcf760b2bdf0a3a82418a1312f03a77e32491bd03
--- build/unittest.sh	(.../unittest.sh)	(revision 83726d95fcac0db6152cd6f89a5ab35ec4251b42)
+++ build/unittest.sh	(.../unittest.sh)	(revision cf760b2bdf0a3a82418a1312f03a77e32491bd03)
@@ -109,6 +109,16 @@
     fi
 }
 
+getAlarmMapping()
+{
+  local currentDir=$(pwd)
+  echo "Path $PATH"
+  echo "Here $currentDir"
+  ./scripts/build/alarmMapping common/common/AlarmDefs.h application/sources/model/hd/alarm/MAlarmMapping.cpp
+
+  cp scripts/build/AlarmMapping.csv $REMOTE_DIR
+}
+
 function make_Directories() {
     echo " ------------------------------ Create the Report output/log folder"
     mkdir -p $LOG_PATH
@@ -440,6 +450,7 @@
     setup_System_Environment # has to be after setup_Script_Environment ran
     clone_Repositories
     make_Directories
+    getAlarmMapping
 
 if [[ ${buildSpecs[$BUILD_ONLY_FLAG_INDEX]} == false ]]
 then