fix sg param in packer jobs

util/packer/jenkins_worker.json

@@ -7,6 +7,7 @@
     "venv_dir": "/edx/app/edx_ansible/venvs/edx_ansible",
     "ami": "{{env `JENKINS_WORKER_AMI`}}",
     "test_platform_version": "{{env `TEST_PLATFORM_VERSION`}}",
+    "security_group": "{{env `AWS_SECURITY_GROUP`}}",
     "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
     "remote_branch": "{{env `REMOTE_BRANCH`}}"
   },
@@ -21,7 +22,7 @@
     "ssh_username": "ubuntu",
     "ami_description": "jenkins worker",
     "iam_instance_profile": "jenkins-worker",
-    "security_group_id": "{{env `AWS_SECURITY_GROUP`}}",
+    "security_group_id": "{{user `security_group`}}",
     "tags": {
       "delete_or_keep": "{{user `delete_or_keep`}}"
     }

util/packer/jenkins_worker_android.json

@@ -5,6 +5,7 @@
     "playbook_remote_dir": "/tmp/packer-edx-playbooks",
     "venv_dir": "/edx/app/edx_ansible/venvs/edx_ansible",
     "ami": "{{env `JENKINS_WORKER_AMI`}}",
+    "security_group": "{{env `AWS_SECURITY_GROUP`}}",
     "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
     "remote_branch": "{{env `REMOTE_BRANCH`}}"
   },
@@ -19,7 +20,7 @@
     "ssh_username": "ubuntu",
     "ami_description": "jenkins worker android",
     "iam_instance_profile": "jenkins-worker",
-    "security_group_id": "{{env `AWS_SECURITY_GROUP`}}",
+    "security_group_id": "{{user `security_group`}}",
     "tags": {
       "delete_or_keep": "{{user `delete_or_keep`}}"
     }

util/packer/jenkins_worker_loadtest.json

@@ -6,6 +6,7 @@
     "playbook_remote_dir": "/tmp/packer-edx-playbooks",
     "venv_dir": "/edx/app/edx_ansible/venvs/edx_ansible",
     "ami": "{{env `JENKINS_WORKER_AMI`}}",
+    "security_group": "{{env `AWS_SECURITY_GROUP`}}",
     "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
     "remote_branch": "{{env `REMOTE_BRANCH`}}"
   },
@@ -20,7 +21,7 @@
     "ssh_username": "ubuntu",
     "ami_description": "jenkins worker loadtest driver",
     "iam_instance_profile": "jenkins-worker",
-    "security_group_id": "{{env `AWS_SECURITY_GROUP`}}",
+    "security_group_id": "{{user `security_group`}}",
     "tags": {
       "delete_or_keep": "{{user `delete_or_keep`}}"
     }

util/packer/jenkins_worker_simple.json

@@ -6,6 +6,7 @@
     "venv_dir": "/edx/app/edx_ansible/venvs/edx_ansible",
     "ami": "{{env `JENKINS_WORKER_AMI`}}",
     "test_platform_version": "{{env `TEST_PLATFORM_VERSION`}}",
+    "security_group": "{{env `AWS_SECURITY_GROUP`}}",
     "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
     "remote_branch": "{{env `REMOTE_BRANCH`}}"
   },
@@ -20,7 +21,7 @@
     "ssh_username": "ubuntu",
     "ami_description": "jenkins worker",
     "iam_instance_profile": "jenkins-worker",
-    "security_group_id": "{{env `AWS_SECURITY_GROUP`}}",
+    "security_group_id": "{{user `security_group`}}",
     "tags": {
         "delete_or_keep": "{{user `delete_or_keep`}}"
     }

util/packer/jenkins_worker_sitespeedio.json

@@ -5,6 +5,7 @@
     "playbook_remote_dir": "/tmp/packer-edx-playbooks",
     "venv_dir": "/edx/app/edx_ansible/venvs/edx_ansible",
     "ami": "{{env `JENKINS_WORKER_AMI`}}",
+    "security_group": "{{env `AWS_SECURITY_GROUP`}}",
     "delete_or_keep": "{{env `DELETE_OR_KEEP_AMI`}}",
     "remote_branch": "{{env `REMOTE_BRANCH`}}"
   },
@@ -19,7 +20,7 @@
     "ssh_username": "ubuntu",
     "ami_description": "jenkins worker sitespeedio",
     "iam_instance_profile": "jenkins-worker",
-    "security_group_id": "{{env `AWS_SECURITY_GROUP`}}",
+    "security_group_id": "{{user `security_group`}}",
     "tags": {
        "delete_or_keep": "{{user `delete_or_keep`}}"
     }

util/packer/webpagetest.json

@@ -2,6 +2,7 @@
   "variables": {
     "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
     "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}",
+    "security_group": "{{env `AWS_SECURITY_GROUP`}}",
     "ami": "{{env `WEBPAGETEST_BASE_AMI`}}"
   },
   "builders": [{
@@ -15,7 +16,7 @@
     "ssh_username": "ubuntu",
     "ami_description": "webpagetest",
     "iam_instance_profile": "jenkins-worker",
-    "security_group_id": "{{env `AWS_SECURITY_GROUP`}}"
+    "security_group_id": "{{user `security_group`}}"
   }],
   "provisioners": [{
     "type": "shell",