diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2015-11-03 10:43:22 -0500 |
|---|---|---|
| committer | Aric Gardner <agardner@linuxfoundation.org> | 2015-11-03 10:44:55 -0500 |
| commit | a4ccfe9afb559571728680a79b3fbaa4260e407f (patch) | |
| tree | 77b6bce26613e7e55762a763630103335ef30645 | |
| parent | fb6e5333dec7223bc4aa397e0930a0e4eb48662e (diff) | |
Small fixes to ownership, test mode.
Make sure that java connection runs in foregrond if script is run in test mode
Make sure slave.jar is owned by jenkinsuser so that it can be updated
Change-Id: I919eaf841569f1540f2a3f026f4a87064bda1b45
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
| -rwxr-xr-x | utils/jenkins-jnlp-connect.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/utils/jenkins-jnlp-connect.sh b/utils/jenkins-jnlp-connect.sh index d048859c2..03e47b8b2 100755 --- a/utils/jenkins-jnlp-connect.sh +++ b/utils/jenkins-jnlp-connect.sh @@ -100,6 +100,7 @@ fi if [[ $started_monit == "true" ]]; then wget --timestamping https://build.opnfv.org/ci/jnlpJars/slave.jar && true +chown $jenkinsuser $jenkinsuser slave.jar if [[ -f /var/run/$jenkinsuser/jenkins_jnlp_pid ]]; then echo "pid file found" @@ -113,9 +114,12 @@ then echo "pid file found" fi fi -exec $connectionstring & -echo $! > /var/run/$jenkinsuser/jenkins_jnlp_pid -#trap 'rm -f "$pidfile"; exit' EXIT SIGQUIT SIGINT SIGSTOP SIGTERM +if [[ run_in_foreground == true ]]; then + $connectionstring +else + exec $connectionstring & + echo $! > /var/run/$jenkinsuser/jenkins_jnlp_pid +fi else echo "you are ready to start monit" @@ -165,7 +169,8 @@ do s ) slave_secret="$OPTARG";; h ) usage; exit;; t ) started_monit=true - skip_monit=true ;; + skip_monit=true + run_in_foreground=true ;; f ) test_firewall ;; \? ) echo "Unknown option: -$OPTARG" >&2; exit 1;; esac |