Merge branch 'SW-931-fix-cobalt-tests' into 'master'

Resolve SW-931 "Fix cobalt tests"

Closes SW-931

See merge request !221

(cherry picked from commit e3d892d6)

b8a772cc Fixed typo (missing quote)
892aea24 Merge branch 'master' of https://git.astron.nl/ro/lofar
d1dcd2d3 Merge branch 'master' of https://git.astron.nl/ro/lofar
c9754522 Merge branch 'master' of https://git.astron.nl/ro/lofar
bd75c484 SW-931: Support tuned.service not being installed when confirming its inactive
7816a56d SW-931: Fix MTU test in presence of VLANs

SubSystems/Online_Cobalt/validation/cobalt/network/interface_mtu_settings.test

@@ -10,7 +10,8 @@ for i in {201..213} ; do
     # the following interfaces need to be connected
     # 10GB03 and 10GB07 are spares and do not need to connected at this moment
     for INTERFACE in 10GB01 10GB02 10GB04 10GB05 10GB06 ; do
-        RESULT=$(ssh $NODE netstat -i | grep $INTERFACE | awk '{ print $2 }')
+        # Avoid grepping VLANs by not accepting interfaces followed by a . (f.e. 10GB06.2201)
+        RESULT=$(ssh $NODE netstat -i | grep "$INTERFACE[^.]" | awk '{ print $2 }')
         if [ $? -eq 0 ] && [ "$RESULT" -eq "9000" ] ; then
             echo "$NODE : interface $INTERFACE has correct MTU of $RESULT"
         else

SubSystems/Online_Cobalt/validation/cobalt/system/tuned.test

@@ -3,7 +3,8 @@
 # Our own hostname must be resolvable
 
 for i in {201..213} ; do
-  ssh cbm$i systemctl status tuned.service | grep "Active: inactive" || exit 1
+  # check for tuned.service to be NOT active, as we then also catch the case in which it is not installed in the first place
+  ssh cbm$i systemctl status tuned.service | grep "Active: active" && exit 1
 done
 
 exit 0