Merge pull request #3746 from edx/jibsheet/jenkins-plugins

Add an ec2 related plugin

playbooks/roles/jenkins_master/tasks/main.yml

@@ -146,6 +146,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 # We first download the plugins to a temp directory and include
 # the version in the file name.  That way, if we increment
@@ -159,6 +160,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 - name: Install Jenkins plugins
   command: "cp {{ item.dest }} {{ jenkins_home }}/plugins/{{ item.item.name }}.hpi"
@@ -167,6 +169,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 - name: Set Jenkins plugin permissions
   file:
@@ -179,6 +182,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 # We had to fork some plugins to workaround
 # certain issues.  If these changes get merged
@@ -195,6 +199,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 - name: Compile custom plugins
   command: "mvn -Dmaven.test.skip=true install"
@@ -205,6 +210,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 - name: Install custom plugins
   command: mv /tmp/{{ item.item.repo_name }}/target/{{ item.item.package }}
@@ -214,6 +220,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 - name: Set custom plugin permissions
   file:
@@ -226,6 +233,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 # Plugins that are bundled with Jenkins are "pinned".
 # Jenkins will overwrite updated plugins with its built-in version
@@ -239,6 +247,7 @@
   tags:
     - install
     - install:base
+    - install:plugins
 
 - name: Setup nginix vhost
   template:

playbooks/roles/tools_jenkins/defaults/main.yml

@@ -46,7 +46,10 @@ jenkins_tools_plugins:
   - { name: "github-oauth", version: "0.24" }
   - { name: "gradle", version: "1.25" }
   - { name: "credentials-binding", version: "1.9" }
+
+# ec2 + dependencies, used by the android build workers + any additional workers we build
   - { name: "ec2", version: "1.36" }
   - { name: "node-iterator-api", version: "1.5" }
   - { name: "aws-java-sdk", version: "1.11.37" }
+  - { name: "jackson2-api", version: "2.5.4" }
   - { name: "aws-credentials", version: "1.11" }