utils: jenkins-jnlp-connect.sh: Make monit actions conditional 59/24859/2
authorMarkos Chandras <mchandras@suse.de>
Thu, 24 Nov 2016 14:42:13 +0000 (14:42 +0000)
committerMarkos Chandras <mchandras@suse.de>
Tue, 29 Nov 2016 12:04:10 +0000 (12:04 +0000)
commitbbb4a9461e9ee5bf8f2e6ef52627565319cb0c96
tree7cb91326ecded64471caa5730c820af827b6c104
parent90dbe41e705c6247f0171380f49873ac40a54eb1
utils: jenkins-jnlp-connect.sh: Make monit actions conditional

When executing the connection testing command as indicated in [1], -t is
added to the monit start-up script parameters. This prevents the jenkins
service from running in the background and create the pid file. Because
of that, monit is confused and reports the service as failed. We fix
this by moving all the monit related actions inside the 'monit'
conditional block.

[1]: http://artifacts.opnfv.org/octopus/brahmaputra/docs/octopus_docs/opnfv-jenkins-slave-connection.html#connecting-slaves-from-community-labs-to-opnfv-jenkins

Change-Id: I7371c4560311b84f56eff3461254264e1769ff7e
Signed-off-by: Markos Chandras <mchandras@suse.de>
utils/jenkins-jnlp-connect.sh