Merge pull request #1371 from edx/feanil/admin_plugins

Feanil/admin plugins

playbooks/roles/jenkins_admin/defaults/main.yml

@@ -91,55 +91,54 @@ jenkins_admin_plugins:
   - { name: "rebuild", version: "1.21" }
   - { name: "build-user-vars-plugin", version: "1.1" }
   - { name: "build-token-root", version: "1.1" }
-  - { name: "matrix-auth", version: "1.0.2" }
-  - { name: "mailer", version: "1.5" }
-  - { name: "external-monitor-job", version: "1.1" }
-  - { name: "ldap", version: "1.2" }
-  - { name: "pam-auth", version: "1.0" }
+  - { name: "matrix-auth", version: "1.2" }
+  - { name: "matrix-project", version: "1.3" }
+  - { name: "mailer", version: "1.9" }
+  - { name: "ldap", version: "1.10.2" }
+  - { name: "pam-auth", version: "1.1" }
   - { name: "ant", version: "1.2" }
-  - { name: "build-user-vars-plugin", version: "1.1" }
-  - { name: "credentials", version: "1.8.3" }
-  - { name: "ssh-credentials", version: "1.5.1" }
-  - { name: "ssh-agent", version: "1.3" }
-  - { name: "token-macro", version: "1.8.1" }
-  - { name: "parameterized-trigger", version: "2.20" }
+  - { name: "build-user-vars-plugin", version: "1.3" }
+  - { name: "credentials", version: "1.15" }
+  - { name: "ssh-credentials", version: "1.7.1" }
+  - { name: "ssh-agent", version: "1.4.1" }
+  - { name: "token-macro", version: "1.10" }
+  - { name: "parameterized-trigger", version: "2.25" }
   - { name: "multiple-scms", version: "0.3" }
-  - { name: "git", version: "1.5.0" }
+  - { name: "git", version: "2.2.2" }
   - { name: "thinBackup", version: "1.7.4" }
-  - { name: "maven-plugin", version: "2.0" }
-  - { name: "build-token-root", version: "1.0" }
+  - { name: "maven-plugin", version: "2.5" }
   - { name: "copy-project-link", version: "1.2" }
   - { name: "scriptler", version: "2.6.1" }
-  - { name: "rebuild", version: "1.20" }
-  - { name: "ssh-slaves", version: "1.4" }
-  - { name: "translation", version: "1.10" }
+  - { name: "rebuild", version: "1.21" }
+  - { name: "ssh-slaves", version: "1.6" }
+  - { name: "translation", version: "1.11" }
   - { name: "dynamicparameter", version: "0.2.0" }
-  - { name: "hipchat", version: "0.1.5" }
-  - { name: "throttle-concurrents", version: "1.8.2" }
+  - { name: "hipchat", version: "0.1.6" }
+  - { name: "throttle-concurrents", version: "1.8.3" }
   - { name: "mask-passwords", version: "2.7.2" }
   - { name: "jquery", version: "1.7.2-1" }
-  - { name: "dashboard-view", version: "2.9.1" }
-  - { name: "build-pipeline-plugin", version: "1.4" }
+  - { name: "dashboard-view", version: "2.9.4" }
+  - { name: "build-pipeline-plugin", version: "1.4.3" }
   - { name: "s3", version: "0.5" }
   - { name: "tmpcleaner", version: "1.1" }
-  - { name: "jobConfigHistory", version: "2.4" }
-  - { name: "build-timeout", version: "1.11" }
-  - { name: "next-build-number", version: "1.0" }
-  - { name: "nested-view", version: "1.10" }
-  - { name: "timestamper", version: "1.5.7" }
-  - { name: "github-api", version: "1.44" }
+  - { name: "jobConfigHistory", version: "2.8" }
+  - { name: "build-timeout", version: "1.14" }
+  - { name: "next-build-number", version: "1.1" }
+  - { name: "nested-view", version: "1.14" }
+  - { name: "timestamper", version: "1.5.14" }
+  - { name: "github-api", version: "1.55" }
   - { name: "postbuild-task", version: "1.8" }
-  - { name: "cobertura", version: "1.9.2" }
   - { name: "notification", version: "1.5" }
-  - { name: "violations", version: "0.7.11" }
   - { name: "copy-to-slave", version: "1.4.3" }
-  - { name: "github", version: "1.8" }
-  - { name: "copyartifact", version: "1.28" }
-  - { name: "shiningpanda", version: "0.20" }
-  - { name: "htmlpublisher", version: "1.2" }
-  - { name: "github-oauth", version: "0.14" }
+  - { name: "github", version: "1.9.1" }
+  - { name: "copyartifact", version: "1.31" }
+  - { name: "shiningpanda", version: "0.21" }
+  - { name: "htmlpublisher", version: "1.3" }
+  - { name: "github-oauth", version: "0.19" }
   - { name: "build-name-setter", version: "1.3" }
-  - { name: "ec2", version: "1.19" }
+  - { name: "ec2", version: "1.23" }
+  - { name: "jenkins-flowdock-plugin", version: "1.1.3" }
+  - { name: "simple-parameterized-builds-report", version: "1.3" }
 
 jenkins_admin_jobs:
   - 'backup-jenkins'

playbooks/roles/jenkins_admin/meta/main.yml

@@ -21,7 +21,8 @@
 dependencies:
   - common
   - aws
-  - jenkins_master
+  - role: jenkins_master
+    jenkins_plugins: $jenkins_admin_plugins
   - role: supervisor
     supervisor_app_dir: "{{ jenkins_supervisor_app_dir }}"
     supervisor_data_dir: "{{ jenkins_supervisor_data_dir }}"

playbooks/roles/jenkins_admin/tasks/main.yml

@@ -41,25 +41,6 @@
   file: path={{ jenkins_admin_scripts_dir }} state=directory
         owner={{ jenkins_user }} group={{ jenkins_group }} mode=755
 
-# We first download the plugins to a temp directory and include
-# the version in the file name.  That way, if we increment
-# the version, the plugin will be updated in Jenkins
-- name: download Jenkins plugins
-  get_url: url=http://updates.jenkins-ci.org/download/plugins/{{ item.name }}/{{ item.version }}/{{ item.name }}.hpi
-           dest=/tmp/{{ item.name }}_{{ item.version }}
-  with_items: jenkins_admin_plugins
-
-- name: install Jenkins plugins
-  command: cp /tmp/{{ item.name }}_{{ item.version }} {{ jenkins_home }}/plugins/{{ item.name }}.hpi
-  with_items: jenkins_admin_plugins
-
-- name: set Jenkins plugin permissions
-  file: path={{ jenkins_home }}/plugins/{{ item.name }}.hpi
-        owner={{ jenkins_user }} group={{ jenkins_group }} mode=700
-  with_items: jenkins_admin_plugins
-  notify:
-    - restart Jenkins
-
 - name: configure s3 plugin
   template: >
     src="./{{ jenkins_home }}/hudson.plugins.s3.S3BucketPublisher.xml.j2"

playbooks/roles/jenkins_master/tasks/main.yml

@@ -23,13 +23,17 @@
 # Should be resolved in the next release, but until then we need to do this
 # https://issues.jenkins-ci.org/browse/JENKINS-20407
 - name: workaround for JENKINS-20407
-  command: "mkdir -p /var/run/jenkins"
-
+  file:
+    path="/var/run/jenkins"
+    state=directory
+    owner="{{ jenkins_user }}"
+    group="{{ jenkins_group }}"
+  
 - name: download Jenkins package
   get_url: url="{{ jenkins_deb_url }}" dest="/tmp/{{ jenkins_deb }}"
 
 - name: install Jenkins package
-  command: dpkg -i --force-depends "/tmp/{{ jenkins_deb }}"
+  shell: dpkg -i --force-depends "/tmp/{{ jenkins_deb }}"
 
 - name: stop Jenkins
   service: name=jenkins state=stopped
@@ -57,8 +61,11 @@
   shell: usermod -d {{jenkins_home}} {{jenkins_user}}
 
 - name: make plugins directory
-  sudo_user: jenkins
-  shell: mkdir -p {{ jenkins_home }}/plugins
+  file:
+    path="{{ jenkins_home }}/plugins"
+    state=directory
+    owner="{{ jenkins_user }}"
+    group="{{ jenkins_group }}"
 
 # We first download the plugins to a temp directory and include
 # the version in the file name.  That way, if we increment
@@ -67,15 +74,18 @@
   get_url: url=http://updates.jenkins-ci.org/download/plugins/{{ item.name }}/{{ item.version }}/{{ item.name }}.hpi
            dest=/tmp/{{ item.name }}_{{ item.version }}
   with_items: jenkins_plugins
+  register: jenkins_plugin_downloads
 
 - name: install Jenkins plugins
-  command: cp /tmp/{{ item.name }}_{{ item.version }} {{ jenkins_home }}/plugins/{{ item.name }}.hpi
-  with_items: jenkins_plugins
+  command: cp {{ item.dest }} {{ jenkins_home }}/plugins/{{ item.item.name }}.hpi
+  with_items: jenkins_plugin_downloads.results
+  when: item.changed
 
 - name: set Jenkins plugin permissions
-  file: path={{ jenkins_home }}/plugins/{{ item.name }}.hpi
+  file: path={{ jenkins_home }}/plugins/{{ item.item.name }}.hpi
         owner={{ jenkins_user }} group={{ jenkins_group }} mode=700
-  with_items: jenkins_plugins
+  with_items: jenkins_plugin_downloads.results
+  when: item.changed
   notify:
     - restart Jenkins
 
@@ -88,23 +98,26 @@
     repo={{ item.repo_url }} dest=/tmp/{{ item.repo_name }} version={{ item.version }}
     accept_hostkey=yes
   with_items: jenkins_custom_plugins
+  register: jenkins_custom_plugins_checkout
 
 - name: compile custom plugins
-  command: mvn -Dmaven.test.skip=true install chdir=/tmp/{{ item.repo_name }}
-  with_items: jenkins_custom_plugins
+  command: mvn -Dmaven.test.skip=true install chdir=/tmp/{{ item.item.repo_name }}
+  with_items: jenkins_custom_plugins_checkout.results
+  when: item.changed 
 
 - name: install custom plugins
-  command: mv /tmp/{{ item.repo_name }}/target/{{ item.package }}
-           {{ jenkins_home }}/plugins/{{ item.package }}
-  with_items: jenkins_custom_plugins
+  command: mv /tmp/{{ item.item.repo_name }}/target/{{ item.item.package }}
+           {{ jenkins_home }}/plugins/{{ item.item.package }}
+  with_items: jenkins_custom_plugins_checkout.results
+  when: item.changed 
   notify:
     - restart Jenkins
 
 - name: set custom plugin permissions
-  file: path={{ jenkins_home }}/plugins/{{ item.package }}
+  file: path={{ jenkins_home }}/plugins/{{ item.item.package }}
         owner={{ jenkins_user }} group={{ jenkins_group }} mode=700
-  with_items: jenkins_custom_plugins
-
+  with_items: jenkins_custom_plugins_checkout.results
+  when: item.changed 
 
 # Plugins that are bundled with Jenkins are "pinned".
 # Jenkins will overwrite updated plugins with its built-in version