Merge pull request #3948 from edx/hchen/email-ext

Hchen/email ext

playbooks/roles/jenkins_master/defaults/main.yml

@@ -7,7 +7,7 @@ jenkins_nginx_port: 80
 jenkins_protocol_https: true
 
 jenkins_version: "1.638"
-jenkins_deb_url: "http://pkg.jenkins-ci.org/debian/binary/jenkins_{{ jenkins_version }}_all.deb"
+jenkins_deb_url: "https://pkg.jenkins.io/debian-stable/binary/jenkins_{{ jenkins_version }}_all.deb"
 jenkins_deb: "jenkins_{{ jenkins_version }}_all.deb"
 # Jenkins jvm args are set when starting the Jenkins service, e.g., "-Xmx1024m"
 jenkins_jvm_args: ""

playbooks/roles/jenkins_master/meta/main.yml

 ---
 dependencies:
   - common
+  - nginx
   - role: oraclejdk
     tags: java

playbooks/roles/tools_jenkins/defaults/main.yml

@@ -14,7 +14,7 @@ jenkins_tools_plugins:
   - { name: "ssh-credentials", version: "1.12" }
   - { name: "ssh-agent", version: "1.13" }
   - { name: "bouncycastle-api", version: "1.648.3" }
-  - { name: "token-macro", version: "1.12.1" }
+  - { name: "token-macro", version: "2.1" }
   - { name: "parameterized-trigger", version: "2.32" }
   - { name: "conditional-buildstep", version: "1.3.5" }
   - { name: "run-condition", version: "0.10" }
@@ -46,6 +46,7 @@ jenkins_tools_plugins:
   - { name: "gradle", version: "1.25" }
   - { name: "credentials-binding", version: "1.9" }
   - { name: "envinject", version: "1.92.1" }
+  - { name: "email-ext", version: "2.57.2" }
 
 # matrix-auth is now pinned to avoid Jenkins overriding
 # 1.3 and later requires icon-shim
@@ -66,3 +67,12 @@ jenkins_tools_bundled_plugins:
   - "pam-auth"
   - "ssh-credentials"
   - "ssh-slaves"
+
+jenkins_debian_pkgs:
+    - nginx
+    - git
+    - maven
+    - daemon
+    - python-pycurl
+    - psmisc
+    - mysql-client-core-5.6

playbooks/roles/tools_jenkins/meta/main.yml

@@ -6,6 +6,6 @@ dependencies:
   - role: jenkins_master
     jenkins_plugins: "{{ jenkins_tools_plugins }}"
     jenkins_version: "{{ jenkins_tools_version }}"
-    jenkins_deb_url: "http://pkg.jenkins-ci.org/debian-stable/binary/jenkins_{{ jenkins_version }}_all.deb"
+    jenkins_deb_url: "https://pkg.jenkins.io/debian-stable/binary/jenkins_{{ jenkins_version }}_all.deb"
     jenkins_custom_plugins: []
     jenkins_bundled_plugins: "{{ jenkins_tools_bundled_plugins }}"