new eidastest version upgrade SC-615

eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml

@@ -20,7 +20,7 @@ eidastest_compose:
        restart: on-failure
 
      eidastest-testid:
-       image: docker.sunet.se/eidastest-testid:2.0.10
+       image: docker.sunet.se/eidastest-testid:2.0.11
        container_name: eidastest-testid
        ports:
          - "443:8099"

global/overlay/etc/puppet/modules/eid/templates/eidastest/config.ini.erb

@@ -1,4 +1,4 @@
 [job-exec "Supervising firefox processes"]
-schedule = @every 30m
+schedule = @every 5m
 container = standalone-firefox
 command = scripts/supervise_firefox_processes.sh

global/overlay/etc/puppet/modules/eid/templates/eidastest/supervise_firefox_processes.sh.erb

@@ -1,18 +1,23 @@
+
 #!/bin/sh
 # Script used for kill of hanging firefox processes
 
+firefox=$(ps -ef | grep firefox -c)
+gecko=$(ps -ef | grep gecko -c)
+sum=$((firefox + gecko))
 echo ""
-if [ $(ps -ef | grep firefox -c) -gt 15 ]
+#if [ $(ps -ef | grep firefox -c) -gt 15 ]
+if [ $sum -gt 15 ]
 then
-   echo "Number of firefox processes are more than 15(" $(ps -ef | grep firefox -c) "), killing all processes!"
+   echo "Number of firefox & gecko processes are more than 15(" $sum "), killing all processes!"
    sleep 2
    $(pkill firefox)
    sleep 2
    $(pkill geckodriver)
    sleep 2
-   echo "Number of firefox processes are now: " $(ps -ef | grep firefox -c)
+#   echo "Number of firefox processes are now: " $(ps -ef | grep firefox -c)
 else
-   echo "Number of firefox processes are less than 15(" $(ps -ef | grep firefox -c) "), no action taken"
+   echo "Number of firefox & gecko processes are less than 15(" $sum "), no action taken"
 fi
 
 echo ""