From 75206ab159211c0ad2ef5b256ec13541c960fb11 Mon Sep 17 00:00:00 2001 From: Timo Mihaljov Date: Fri, 1 Jul 2016 13:05:40 +0300 Subject: [PATCH] Add option solita_jenkins_restart --- CHANGELOG.rst | 15 +++++++++++++++ defaults/main.yml | 1 + doc/solita.jenkins.rst | 2 +- tasks/restart.yml | 29 ++++++++++++++++------------- 4 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 CHANGELOG.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst new file mode 100644 index 0000000..9faa7b0 --- /dev/null +++ b/CHANGELOG.rst @@ -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. diff --git a/defaults/main.yml b/defaults/main.yml index f3fc3bd..2b27733 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/doc/solita.jenkins.rst b/doc/solita.jenkins.rst index d00c42f..2cf94d7 100644 --- a/doc/solita.jenkins.rst +++ b/doc/solita.jenkins.rst @@ -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 diff --git a/tasks/restart.yml b/tasks/restart.yml index 8864efd..108bfa0 100644 --- a/tasks/restart.yml +++ b/tasks/restart.yml @@ -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