Skip to content

Commit

Permalink
Add option solita_jenkins_restart
Browse files Browse the repository at this point in the history
  • Loading branch information
solita-timo-mihaljov committed Jul 1, 2016
1 parent 9a079fc commit 75206ab
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 14 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
=========
Changelog
=========

--------------------------
Version 1.0.1 (2016-07-01)
--------------------------

- Prevent Jenkins restart when variable ``solita_jenkins_restart`` is set to ``no``.

--------------------------
Version 1.0.0 (2016-06-29)
--------------------------

- Add support for Jenkins 2.
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ solita_jenkins_absent_users: []
solita_jenkins_jobs_dir: "{{ playbook_dir }}/jobs"
solita_jenkins_security_realm: jenkins
solita_jenkins_jnlp_port: 0
solita_jenkins_restart: yes
2 changes: 1 addition & 1 deletion doc/solita.jenkins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ You can install this role and its dependencies with ansible-galaxy_. First add t
# requirements.yml
---
- src: https://github.com/solita/ansible-role-solita.jenkins.git
version: v1.0.0
version: v1.0.1
name: solita.jenkins
.. highlight:: sh
Expand Down
29 changes: 16 additions & 13 deletions tasks/restart.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
---
- name: Restart Jenkins
service: name=jenkins state=restarted
become: yes
- block:
- name: Restart Jenkins
service: name=jenkins state=restarted
become: yes

# Stolen from geerlingguy.jenkins.
- name: Wait for Jenkins to start up before proceeding.
shell: "curl -D - --silent {{ solita_jenkins_url }}/cli/"
args:
warn: no
register: result
until: (result.stdout.find("403 Forbidden") != -1) or (result.stdout.find("200 OK") != -1) and (result.stdout.find("Please wait while") == -1)
retries: "{{ jenkins_connection_retries }}"
delay: "{{ jenkins_connection_delay }}"
changed_when: false
# Stolen from geerlingguy.jenkins.
- name: Wait for Jenkins to start up before proceeding.
shell: "curl -D - --silent {{ solita_jenkins_url }}/cli/"
args:
warn: no
register: result
until: (result.stdout.find("403 Forbidden") != -1) or (result.stdout.find("200 OK") != -1) and (result.stdout.find("Please wait while") == -1)
retries: "{{ jenkins_connection_retries }}"
delay: "{{ jenkins_connection_delay }}"
changed_when: false

when: solita_jenkins_restart

0 comments on commit 75206ab

Please sign in to comment.