Merge pull request #2674 from edx/benp/packer-test-capability

Tag jenkins_worker AMIs for deletion

util/packer/jenkins_worker.json

@@ -4,7 +4,8 @@
     "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}",
     "playbook_remote_dir": "/tmp/packer-edx-playbooks",
     "ami": "{{env `JENKINS_WORKER_AMI`}}",
-    "test_platform_version": "{{env `TEST_PLATFORM_VERSION`}}"
+    "test_platform_version": "{{env `TEST_PLATFORM_VERSION`}}",
+    "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}"
   },
   "builders": [{
     "type": "amazon-ebs",
@@ -17,7 +18,10 @@
     "ssh_username": "ubuntu",
     "ami_description": "jenkins worker",
     "iam_instance_profile": "jenkins-worker",
-    "security_group_id": "sg-75af5e18"
+    "security_group_id": "sg-75af5e18",
+    "tags": {
+      "delete_or_keep": "{{user `delete_or_keep`}}"
+    }
   }],
   "provisioners": [{
     "type": "shell",