Merge branch 'iviumsoft41172' into 'master'

iviumsoft -> 4.1172

See merge request !364

packages/iviumsoft.xml

@@ -3,17 +3,24 @@
 
   <package id="iviumsoft" name="IviumSoft" revision="%version%.1" priority="50" reboot="false">
     <variable name="major" value="4" />
-    <variable name="minor" value="1170" />
+    <variable name="minor" value="1172" />
     <variable name="version" value="%major%.%minor%" />
-    <variable name="GIT_CITEST"      value="broken" /><!-- Advfireall - file not found -->
 
     <check type="uninstall" path="IviumSoft %major%" condition="versiongreaterorequal" value="%version%" />
 
     <install cmd='%WPKGSOFTWARE%\ivium\iviumsoft\iviumsoftsetup-%version%.exe /sp- /verysilent /suppressmsgboxes /norestart' />
     <!-- upon launching the software, Windows firewall asks to grant network access. Upon clicking 'cancel' it creates
          the following pair of rules - so we do so too, as I've not determined any reason why it needs access -->
-    <install cmd='netsh advfirewall firewall add rule name="deny iviumsoft udp" dir=in program="c:\iviumstat\iviumsoft.exe" protocol=udp action=block' />
-    <install cmd='netsh advfirewall firewall add rule name="deny iviumsoft tcp" dir=in program="c:\iviumstat\iviumsoft.exe" protocol=tcp action=block' />
+    <install cmd='netsh advfirewall firewall add rule name="deny iviumsoft udp" dir=in program="c:\iviumstat\iviumsoft.exe" protocol=udp action=block'>
+      <condition>
+        <check type="host" condition="environment" value="GITLAB_CI=^$" />
+      </condition>
+    </install>
+    <install cmd='netsh advfirewall firewall add rule name="deny iviumsoft tcp" dir=in program="c:\iviumstat\iviumsoft.exe" protocol=tcp action=block'>
+      <condition>
+        <check type="host" condition="environment" value="GITLAB_CI=^$" />
+      </condition>
+    </install>
 
     <upgrade include='remove' />
     <upgrade include='install' />
@@ -21,8 +28,18 @@
     <remove cmd='"c:\iviumstat\unins000.exe"  /VERYSILENT /suppressmsgboxes /norestart'>
       <exit code="-1"/>
     </remove>
-    <remove cmd='netsh advfirewall firewall del rule name="deny iviumsoft udp"'><exit code='1' /></remove>
-    <remove cmd='netsh advfirewall firewall del rule name="deny iviumsoft tcp"'><exit code='1' /></remove>
+    <remove cmd='netsh advfirewall firewall del rule name="deny iviumsoft udp"'>
+      <condition>
+        <check type="host" condition="environment" value="GITLAB_CI=^$" />
+      </condition>
+      <exit code='1' />
+    </remove>
+    <remove cmd='netsh advfirewall firewall del rule name="deny iviumsoft tcp"'>
+      <condition>
+        <check type="host" condition="environment" value="GITLAB_CI=^$" />
+      </condition>
+      <exit code='1' />
+    </remove>
 
   </package>
 </packages:packages>