swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

new eidastest version upgrade SC-615

Browse source
This commit is contained in:
Maria Haider 2021-10-21 12:32:47 +02:00
parent 91c5bb98b2
commit e08f4c9d4e
Signed by: mariah
GPG key ID: 7414A760CA747E57
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -1,18 +1,23 @@
#!/bin/sh #!/bin/sh
# Script used for kill of hanging firefox processes # Script used for kill of hanging firefox processes
firefox=$(ps -ef | grep firefox -c)
gecko=$(ps -ef | grep gecko -c)
sum=$((firefox + gecko))
echo "" echo ""
if [ $(ps -ef | grep firefox -c) -gt 15 ] #if [ $(ps -ef | grep firefox -c) -gt 15 ]
if [ $sum -gt 15 ]
then 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 sleep 2
$(pkill firefox) $(pkill firefox)
sleep 2 sleep 2
$(pkill geckodriver) $(pkill geckodriver)
sleep 2 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 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 fi
echo "" echo ""