centos 6/7 builds with updated url mangling

Author: amandamoulckers

build_linux_baselines.py

@@ -16,6 +16,8 @@ def build_base(packer_var_file, common_vars, packerfile, replace_existing, vmSer
     TEMP_DIR="tmp"
 
     vm_name = packer_var_file.strip(".json")
+    if "-server" in vm_name:
+        vm_name = vm_name[:vm_name.index("-server")]
 
     temp_path = os.path.join("..", "..", TEMP_DIR, prependString + vm_name)
 
@@ -109,22 +111,27 @@ def main(argv):
 
     vm_server = serverHelper(esxi_file)
 
-    for os_dir in os.listdir("boxcutter"):
-        common_var_file = os.path.join("linux_vars", os_dir + "_common.json")
-        with open(os.path.join("", common_var_file)) as common_var_source:
-            common_vars = json.load(common_var_source)
+    os.chdir("boxcutter")
 
-        os.chdir(os.path.join("boxcutter", os_dir))
-        packer_file = os_dir + ".json"
+    for os_dir in os.listdir("."):
+        if os.path.isdir(os.path.join(".", os_dir)):
+            common_var_file = os.path.join("..", "linux_vars", os_dir + "_common.json")
+            with open(os.path.join("", common_var_file)) as common_var_source:
+                common_vars = json.load(common_var_source)
 
-        targets = []
-        for pattern in common_vars['file_patterns']:
-            targets.extend(glob.glob(pattern))
+            os.chdir(os.path.join("", os_dir))
+            packer_file = os_dir + ".json"
 
-        for target in tqdm(targets):
-            build_base(target, common_vars, packer_file, replace_existing=replace_vms, vmServer=vm_server, prependString=prependString)
+            targets = []
+            for pattern in common_vars['file_patterns']:
+                print pattern
+                targets.extend(glob.glob(pattern))
 
-        os.chdir("../../")
+            print "\nBuilding " + str(len(targets)) + " " + os_dir.capitalize() + " baselines:"
+            for target in tqdm(targets):
+                build_base(target, common_vars, packer_file, replace_existing=replace_vms, vmServer=vm_server, prependString=prependString)
+
+            os.chdir("../")
 
     return True
 

lib/packerMod.py

@@ -58,30 +58,27 @@ def update_linux_config(self, template):
                 })
                 break
 
-    def update_url(self, template): #this could be a lot better, I'll think on it
-        if 'centos' in template['vm_name']:
-            url = template['update_url_template'] + template['iso_url'][template['iso_url'].index("centos"):]
-        else:
-            version = re.search('(\d\d\.\d\d\.\d)', template['iso_name'])
+    def update_url(self, template):
+
+        base = template['update_url_template']
+
+        if "VERSION" in template['update_url_template']: # this essentially just deals with ubuntu url's (or other difficult ones that pop up)
+            version = re.search('\d\d\.\d\d\.\d', template['iso_name'])
             if version:
-                v = version.group(0)
-                url = '/'.join([template['update_url_template'], v, template['iso_name']])
+                base = base[:base.index("VERSION")] + version.group(0)
             else:
-                version = re.search('(\d\d\.\d\d)', template['iso_name'])
-                if version:
-                    v = version.group(0)
-                    if 'live' in template['iso_name']: # handles more recent releases of ubuntu
-                        url = '/'.join([template['update_url_template'], v, template['iso_name']])
-                    else:
-                        v = v + ".0"
-                        url = '/'.join([template['update_url_template'], v, template['iso_name']])
+                version = re.search('\d\d.\d\d', template['iso_name'])
+                if version and 'live' in template['iso_name']:
+                    version = version.group(0)
                 else:
-                    version = re.search('\d\d', template['vm_name'])
-                    v = version.group(0)
-                    url = '/'.join([template['update_url_template'], version.group(0), "Server/x86_64/iso", template['iso_name']])
-
+                    version = version.group(0) + ".0"
+                base = base[:base.index("VERSION")] + version
+            url = '/'.join([base, template['iso_name']])
+        else: # this should handle all other os url's
+            url = '/'.join([base, template['iso_url'][template['iso_url'].index(template['url_base_common'])+len(template['url_base_common']):]])
+        
         template.update({
-                        "iso_url": url
+                    "iso_url": url
             })
 
 

linux_vars/centos_common.json

@@ -9,12 +9,11 @@
     "custom_script":  "../../scripts/centos_customs/centos_setup.sh",
     "vmware_script":  "../../scripts/centos_customs/centos_vmware.sh",
     "cleanup_script": "script/cleanup.sh",
-    "update_url_template": "http://repos-lax.psychz.net/",
+    "update_url_template": "http://repos-lax.psychz.net/centos",
+    "url_base_common": "/centos/",
     "file_patterns": [
-      "centos[123456789].json"
-    ],
-    "boot_command": [
-      "<up><wait><tab> text ks=hd:fd0:/ks.cfg<enter>"
+      "centos[1-9].json"
     ],
+    "boot_command": "<up><wait><tab> text ks=hd:fd0:/ks.cfg<enter>",
     "kickstart": "ks.cfg"
 }

linux_vars/fedora_common.json

@@ -9,9 +9,10 @@
     "cleanup_script": "../../scripts/fedora_customs/fedora_cleanup.sh",
     "http_directory": "http",
     "update_url_template": "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases",
+    "url_base_common": "/releases/",
     "file_patterns": [
-      "fedora[23456789][0123456789].json",
-      "fedora[23456789][0123456789]-server.json"
+      "fedora[1-9][1-9].json",
+      "fedora[1-9]*-server.json"
     ],
     "boot_command": "<tab> linux text biosdevname=0 ks=hd:fd0:/{{ user `kickstart` }}<enter><enter>"
 }

linux_vars/ubuntu_common.json

@@ -10,7 +10,8 @@
     "minimize_script":  "../../scripts/ubuntu_customs/ubuntu_minimize.sh",
     "vmware_script":  "../../scripts/ubuntu_customs/ubuntu_vmware.sh",
     "cleanup_script": "script/cleanup.sh",
-    "update_url_template": "http://old-releases.ubuntu.com/releases",
+    "update_url_template": "http://old-releases.ubuntu.com/releases/VERSION",
+    "url_base_common": ".com/",
     "file_patterns": [
       "ubuntu1[468]04.json"
     ]