Merge pull request #4226 from edx/youngstrom/ec2_rollback

Revert to ec2 1.28

playbooks/roles/jenkins_build/defaults/main.yml

@@ -26,7 +26,7 @@ build_jenkins_plugins_list:
     version: '1.3'
     group: 'org.jenkins-ci.plugins'
   - name: 'script-security'
-    version: '1.34'
+    version: '1.27'
     group: 'org.jenkins-ci.plugins'
   - name: 'mailer'
     version: '1.16'
@@ -50,13 +50,7 @@ build_jenkins_plugins_list:
     version: '1.7'
     group: 'org.jenkins-ci.plugins'
   - name: 'credentials'
-    version: '2.1.16'
-    group: 'org.jenkins-ci.plugins'
-  - name: 'aws-credentials'
-    version: '1.23'
-    group: 'org.jenkins-ci.plugins'
-  - name: 'plain-credentials'
-    version: '1.3'
+    version: '2.1.8'
     group: 'org.jenkins-ci.plugins'
   - name: 'ssh-credentials'
     version: '1.11'
@@ -119,10 +113,10 @@ build_jenkins_plugins_list:
     version: '1.32.1'
     group: 'org.jenkins-ci.plugins'
   - name: 'credentials-binding'
-    version: '1.13'
+    version: '1.7'
     group: 'org.jenkins-ci.plugins'
   - name: 'ec2'
-    version: '1.36'
+    version: '1.28'
     group: 'org.jenkins-ci.plugins'
   - name: 'envinject'
     version: '2.0'
@@ -211,9 +205,6 @@ build_jenkins_plugins_list:
   - name: 'violations'
     version: '0.7.11'
     group: 'org.jenkins-ci.plugins'
-  - name: 'workflow-scm-step'
-    version: '2.4'
-    group: 'org.jenkins-ci.plugins.workflow'
   - name: 'xunit'
     version: '1.93'
     group: 'org.jenkins-ci.plugins'

playbooks/roles/jenkins_common/templates/config/credentials.yml.j2

@@ -49,11 +49,3 @@
   description: '{{ custom_ssh.description }}'
   id: '{{ custom_ssh.id }}'
 {% endfor %}
-{% for aws in JENKINS_AWS_LIST %}
-- credentialType: 'aws'
-  scope: '{{ aws.scope }}'
-  id: '{{ aws.id }}'
-  accessKeyId: '{{ aws.accessKeyId }}'
-  secretAccessKey: '{{ aws.secretAccessKey }}'
-  description: '{{ aws.description }}'
-{% endfor %}

playbooks/roles/jenkins_common/templates/config/ec2_config.yml.j2

 ---
 CLOUDS:
     - NAME: '{{ JENKINS_EC2_REGION }}'
-      CREDENTIAL_ID: '{{ JENKINS_EC2_CREDENTIAL_ID }}'
+      ACCESS_KEY_ID: '{{ JENKINS_EC2_ACCESS_KEY_ID }}'
+      SECRET_ACCESS_KEY: '{{ JENKINS_EC2_SECRET_ACCESS_KEY }}'
       USE_INSTANCE_PROFILE_FOR_CREDS: {{ jenkins_common_use_instance_profile_for_creds }}
       REGION: '{{ JENKINS_EC2_REGION }}'
       EC2_PRIVATE_KEY_PATH: '{{ jenkins_common_config_path }}/ec2/id_rsa'
@@ -17,7 +18,6 @@ CLOUDS:
             REMOTE_FS_ROOT: '{{ ami.REMOTE_FS_ROOT }}'
             SSH_PORT: '{{ ami.SSH_PORT }}'
             INSTANCE_TYPE: '{{ ami.INSTANCE_TYPE }}'
-            EBS_OPTIMIZED: {{ ami.EBS_OPTIMIZED }}
             LABEL_STRING: '{{ ami.LABEL_STRING }}'
             MODE: '{{ ami.MODE }}'
             DESCRIPTION: '{{ ami.DESCRIPTION }}'