Code refactor and various changes

Makefile.cache

@@ -1,23 +1,28 @@
 CURL=curl -L
 
 all: \
-	cache/nix-2.0.2-x86_64-linux.tar.bz2 \
-	cache/jdk-8u144-linux-x64.rpm \
+	cache/nix-2.1.1-x86_64-linux.tar.bz2 \
+	cache/jdk-8u172-linux-x64.rpm \
 	cache/netbeans-8.2-javase-linux.sh \
-	cache/ideaIC-2018.1.3.tar.gz
+	cache/ideaIC-2018.2.2.tar.gz \
+	cache/CLion-2018.2.3.tar.gz
 
-cache/nix-2.0.2-x86_64-linux.tar.bz2: | cache
-    ${CURL} https://nixos.org/releases/nix/nix-2.0.2/nix-2.0.2-x86_64-linux.tar.bz2 > $@
+cache/nix-2.1.1-x86_64-linux.tar.bz2: | cache
+	${CURL} 'https://nixos.org/releases/nix/nix-2.1.1/nix-2.1.1-x86_64-linux.tar.bz2' > $@
 
-cache/jdk-8u144-linux-x64.rpm: | cache
-	${CURL} -H 'Cookie: oraclelicense=accept-securebackup-cookie' \
-        http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-8u144-linux-x64.rpm > $@
+
+cache/jdk-8u172-linux-x64.rpm: | cache
+	${CURL} -H "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
+		'http://download.oracle.com/otn-pub/java/jdk/8u172-b11/a58eab1ec242421181065cdc37240b08/jdk-8u172-linux-x64.rpm' > $@
 
 cache/netbeans-8.2-javase-linux.sh: | cache
-	${CURL} http://download.netbeans.org/netbeans/8.2/final/bundles/netbeans-8.2-javase-linux.sh > $@
+	${CURL} 'http://download.netbeans.org/netbeans/8.2/final/bundles/netbeans-8.2-javase-linux.sh' > $@
+
+cache/ideaIC-2018.2.2.tar.gz: | cache
+	${CURL} 'https://download.jetbrains.com/idea/ideaIC-2018.2.2.tar.gz' > $@
 
-cache/ideaIC-2018.1.3.tar.gz: | cache
-	${CURL} https://download.jetbrains.com/idea/ideaIC-2018.1.3.tar.gz > $@
+cache/CLion-2018.2.3.tar.gz: | cache
+	${CURL} 'https://download.jetbrains.com/cpp/CLion-2018.2.3.tar.gz' > $@
 
 cache:
 	mkdir cache

RPM-GPG-KEY-oracle-ol6

@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBEwtJWoBCACpiY2rGA6T0ceBi92X88/QclytVBjtDRohOVzs3pmIPh3ULqsW
+G323nmyKbKQBBSjh9OnuO9Y09VG8mzr/w9YV0Ix4cI9/HDTERZ2+TR5u+VNn5J5h
+yvwQSN/FEK6oH2+mz7O0yUNleN7UltR4MOEkHIoAhIvv+1AQQKN3OM8oalz+3gv/
+zz9rAoQczQzT7QWOtBrsRMZgBrKXY/TpJrpVSO3Hx8CnbhKGtLxCCrxZ5v7hh1ht
+3CRAr2+h5bDA9KP6vBZWKEs7NgcvtZFDY6EJc7AoApr3phX9hHE2+snTxe82DkFT
+uA69C8wLyjPCoSy+tcaCqJKOZelNy9RN/WKRABEBAAG0RE9yYWNsZSBPU1MgZ3Jv
+dXAgKE9wZW4gU291cmNlIFNvZnR3YXJlIGdyb3VwKSA8YnVpbGRAb3NzLm9yYWNs
+ZS5jb20+iQE8BBMBAgAmBQJMLSVqAhsDBQkWjmoABgsJCAcDAgQVAggDBBYCAwEC
+HgECF4AACgkQcvl7dOxVHwMiNAf/cD8R74fCBeQsAYid5slIz7CG8xEOBUTDNEJT
+p/owtzr7m7Ydp1txNBOkVeVkUP8czX5EldcmoxA4kCCyHhnxmpJnOt52Fy5ZRnYh
+Ll5gYdpJpXGVScB7fnlh3rJAaesSTacVFC5MKIYPZBiTo9soSXMLNcG8WqHPasdd
+AblC4t5BTDNYlX1RiPeP6m5egHnnxyAXsis8fqIZY0RC9hERxWQ6hdDAX0tJXY8F
+88HDUozvo8jqTlg/5GZcfqcbUjjMUJQ5cBtH3adCthMycdPpPXWJQBuzMIdFJ03u
+YuQ3XrKxBkOLips+OZuWNVZzrPOHsenb49aX4yQsLVc2E2fhKQ==
+=M8XY
+-----END PGP PUBLIC KEY BLOCK-----

c6x64/gui-dev-java.json

@@ -2,41 +2,106 @@
   "provisioners": [
     {
       "type": "file",
-      "source": "cache/nix-2.0.2-x86_64-linux.tar.bz2",
-      "destination": "nix-2.0.2-x86_64-linux.tar.bz2"
-    },
-    {
+      "source": "cache/{{user `NIX_FILENAME`}}",
+      "destination": "{{user `NIX_FILENAME`}}"
+  },
+  {
       "type": "file",
-      "source": "cache/ideaIC-2018.1.3.tar.gz",
-      "destination": "ideaIC-2018.1.3.tar.gz"
-    },
-    {
+      "source": "RPM-GPG-KEY-oracle-ol6",
+      "destination": "RPM-GPG-KEY-oracle-ol6"
+  },
+  {
+      "type": "file",
+      "source": "cache/{{user `JDK_FILENAME`}}",
+      "destination": "{{user `JDK_FILENAME`}}"
+  },
+
+  {
+      "type": "file",
+      "source": "cache/{{ user `VMWARE_TOOLS_FILENAME` }}",
+      "destination": "{{ user `VMWARE_TOOLS_FILENAME` }}"
+  },
+
+  {
+     "type": "file",
+     "source": "cache/{{ user `INTELLIJ_FILENAME` }}",
+     "destination": "{{ user `INTELLIJ_FILENAME` }}"
+   },
+
+   {
       "type": "file",
-      "source": "cache/jdk-8u144-linux-x64.rpm",
-      "destination": "jdk-8u144-linux-x64.rpm"
+      "source": "cache/{{ user `CLION_FILENAME` }}",
+      "destination": "{{ user `CLION_FILENAME` }}"
     },
-    {
+
+   {
+       "type": "shell-local",
+       "command": "chmod 777 cache/{{ user `NETBEANS_FILENAME` }}"
+   },
+   {
       "type": "file",
-      "source": "cache/netbeans-8.2-javase-linux.sh",
-      "destination": "netbeans-8.2-javase-linux.sh"
+      "source": "cache/{{ user `NETBEANS_FILENAME` }}",
+      "destination": "{{ user `NETBEANS_FILENAME` }}"
     },
     {
+        "type": "shell-local",
+        "command": "patch scripts/install-nix-2.1.1 < scripts/nixpatch"
+    },
+  {
       "type": "shell",
-      "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
+      "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
       "scripts": [
-        "scripts/nix.sh",
-        "scripts/nix-chromium.sh",
-        "scripts/jdk.sh",
-        "scripts/netbeans.sh",
-        "scripts/intellij.sh",
-        "scripts/cleanup.sh"
-      ]
-    }
-  ],
+        "scripts/install-nix-2.1.1"
+    ]
+},
+{
+    "type": "shell-local",
+    "command": "patch -R scripts/install-nix-2.1.1 < scripts/nixpatch"
+},
+{
+    "type": "shell",
+    "environment_vars": [ "JDK_FILENAME={{user `JDK_FILENAME`}}" ],
+    "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
+    "scripts": [
+      "scripts/install_jdk.sh"
+  ]
+},
+{
+    "type": "shell",
+    "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
+    "scripts": [
+      "scripts/install_vmtools.sh"
+  ]
+},
+{
+    "type": "shell",
+    "environment_vars": [ "INTELLIJ_FILENAME={{ user `INTELLIJ_FILENAME` }}" ],
+    "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
+    "scripts": [
+      "scripts/install_intellij.sh"
+  ]
+},
+{
+    "type": "shell",
+    "environment_vars": [ "CLION_FILENAME={{ user `CLION_FILENAME` }}" ],
+    "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
+    "scripts": [
+      "scripts/install_clion.sh"
+  ]
+},
+{
+    "type": "shell",
+    "environment_vars": [ "NETBEANS_FILENAME={{ user `NETBEANS_FILENAME` }}" ],
+    "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
+    "scripts": [
+      "scripts/install_netbeans.sh"
+  ]
+}
+],
   "builders": [
     {
       "type": "virtualbox-ovf",
-      "source_path": "build/c6x64-gui.ova",
+      "source_path": "c6x64-gui.ova",
       "output_directory": "build/out",
       "vm_name": "c6x64-gui-dev-java",
       "boot_wait": "5s",
@@ -47,15 +112,15 @@
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
-      "shutdown_command": "echo 'rm -f /etc/ssh/ssh_host*; rm -f /tmp/shutdown.sh; /sbin/halt -h -p' > /tmp/shutdown.sh; sudo sh /tmp/shutdown.sh",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "1024"
-        ]
-      ]
+      "shutdown_command": "echo 'rm -f /etc/ssh/ssh_host*; rm -f /tmp/shutdown.sh; /sbin/halt -h -p' > /tmp/shutdown.sh; sudo sh /tmp/shutdown.sh"
     }
-  ]
+],
+
+"post-processors": [
+    {
+      "type": "shell-local",
+      "command": "mv build/out/c6x64-gui-dev-java.ova . ; rm -rf build/*"
+  }
+]
+
 }

c6x64/gui.json

@@ -12,7 +12,7 @@
   "builders": [
     {
       "type": "virtualbox-ovf",
-      "source_path": "build/c6x64-kernel-ml-epel.ova",
+      "source_path": "c6x64-kernel-ml-epel.ova",
       "output_directory": "build/out",
       "vm_name": "c6x64-gui",
       "boot_wait": "5s",
@@ -23,15 +23,13 @@
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
-      "shutdown_command": "echo 'rm -f /etc/ssh/ssh_host*; rm -f /tmp/shutdown.sh; /sbin/halt -h -p' > /tmp/shutdown.sh; sudo sh /tmp/shutdown.sh",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "1024"
-        ]
-      ]
+      "shutdown_command": "echo 'rm -f /etc/ssh/ssh_host*; rm -f /tmp/shutdown.sh; /sbin/halt -h -p' > /tmp/shutdown.sh; sudo sh /tmp/shutdown.sh"
+
     }
-  ]
+],
+
+"post-processors": [{
+      "type": "shell-local",
+      "command": "mv build/out/c6x64-gui.ova . ; rm -rf build/*"
+  }]
 }

c6x64/kernel-ml-epel.json

@@ -7,14 +7,15 @@
       "scripts": [
         "scripts/elrepo-kernel-ml.sh",
         "scripts/epel.sh",
+        "scripts/install_ansible.sh",
         "scripts/cleanup.sh"
       ]
     }
   ],
   "builders": [
     {
       "type": "virtualbox-ovf",
-      "source_path": "build/c6x64-minimal.ova",
+      "source_path": "c6x64-minimal.ova",
       "output_directory": "build/out",
       "vm_name": "c6x64-kernel-ml-epel",
       "boot_wait": "5s",
@@ -26,14 +27,11 @@
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'rm -f /etc/ssh/ssh_host*; rm -f /tmp/shutdown.sh; /sbin/halt -h -p' > /tmp/shutdown.sh; sudo sh /tmp/shutdown.sh",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "1024"
-        ]
-      ]
+      "post_shutdown_delay" : "2m"
     }
-  ]
+],
+"post-processors": [{
+      "type": "shell-local",
+      "command": "mv build/out/c6x64-kernel-ml-epel.ova . ; rm -rf build/*"
+  }]
 }

c6x64/minimal.json

@@ -4,9 +4,12 @@
       "type": "shell",
       "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
       "scripts": [
+        "scripts/install_svn.sh",
+        "scripts/install_git.sh",
         "scripts/cleanup.sh"
       ]
-    }
+  }
+
   ],
   "builders": [
     {
@@ -17,27 +20,29 @@
         "<tab> text selinux=0 ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos6.ks<enter><wait>"
       ],
       "boot_wait": "5s",
-      "disk_size": 409600,
+      "disk_size": 307200,
       "format": "ova",
       "guest_additions_mode": "disable",
       "guest_os_type": "RedHat_64",
       "http_directory": "http",
-      "iso_url": "http://mirrors.kernel.org/centos/6/isos/x86_64/CentOS-6.9-x86_64-minimal.iso",
-      "iso_checksum_type": "sha256",
-      "iso_checksum": "422af57b493b8af49d485885a730c5a1d955f803fac85aa51311c393168b9080",
+      "iso_url": "https://mirrors.edge.kernel.org/centos/6/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
+      "iso_checksum_type": "sha1",
+      "iso_checksum": "9cecc12a66c4f9a4225d18fe0aaab412ba367549",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'rm -f /etc/ssh/ssh_host*; rm -f /tmp/shutdown.sh; /sbin/halt -h -p' > /tmp/shutdown.sh; sudo sh /tmp/shutdown.sh",
+      "post_shutdown_delay" : "2m",
       "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "1024"
-        ]
+        ["modifyvm", "{{.Name}}", "--memory","8192"],
+        ["modifyvm", "{{.Name}}", "--cpus", "3"]
       ]
     }
-  ]
+],
+
+"post-processors": [{
+      "type": "shell-local",
+      "command": "mv build/out/c6x64-minimal.ova . ; rm -rf build/*"
+  }]
 }

c6x64/minimal_vmware.json

@@ -0,0 +1,38 @@
+{
+  "provisioners": [
+    {
+      "type": "shell",
+      "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
+      "scripts": [
+        "scripts/cleanup.sh"
+      ]
+    }
+  ],
+  "builders": [
+    {
+      "type": "vmware-iso",
+      "output_directory": "build/out",
+      "vm_name": "c6x64-minimal",
+      "boot_command": [
+        "<tab> text selinux=0 ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos6.ks<enter><wait>"
+      ],
+      "boot_wait": "5s",
+      "disk_size": 10240,
+      "format": "ova",
+      "guest_os_type": "RedHat_64",
+      "http_directory": "http",
+      "iso_url": "https://mirrors.edge.kernel.org/centos/6/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
+      "iso_checksum_type": "sha1",
+      "iso_checksum": "9cecc12a66c4f9a4225d18fe0aaab412ba367549",
+      "ssh_username": "vagrant",
+      "ssh_password": "vagrant",
+      "ssh_port": 22,
+      "ssh_wait_timeout": "10000s",
+      "shutdown_command": "echo 'rm -f /etc/ssh/ssh_host*; rm -f /tmp/shutdown.sh; /sbin/halt -h -p' > /tmp/shutdown.sh; sudo sh /tmp/shutdown.sh",
+      "vmx_data": {
+              "memsize": "8192",
+              "numvcpus": "3"
+      }
+    }
+  ]
+}

c6x64/newuser.json

@@ -0,0 +1,15 @@
+{
+  "NEWUSERLOGIN": "flast",
+  "NEWUSERFULLNAME": "First Last",
+  "AWS_ACCESS_KEY_ID": "AWS_ACCESS_KEY_ID",
+  "AWS_SECRET_ACCESS_KEY": "AWS_SECRET_ACCESS_KEY",
+  "AZURE_SECRET" : "AZURE_SECRET\\nAZURE_SECRET2\\nAZURE_SECRET3",
+  "SVN_SERVER_URL": "svn.int.snowflakecomputing.com",
+  "JDK_FILENAME": "jdk-8u172-linux-x64.rpm",
+  "INTELLIJ_FILENAME": "ideaIC-2018.2.2.tar.gz",
+  "CLION_FILENAME": "CLion-2018.2.3.tar.gz",
+  "NETBEANS_FILENAME": "netbeans-8.2-javase-linux.sh",
+  "VMWARE_TOOLS_FILENAME": "VMwareTools-10.0.6-3595377.tar.gz",
+  "NIX_FILENAME": "nix-2.1.1-x86_64-linux.tar.bz2"
+
+}