jowj
/
wintriallab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor improvements to help with collaboration

Browse Source 
- Rename buildpacker to buildlab, since it's not just a packer thing
- Clean up hardcoded crap and references to (the old Python version of)
  caryatid from buildlab
- Delete code as much as possible, shortening file by ~30%
- Minor readme cleanup
jowjDev
Micah R Ledbetter 7 years ago
parent de5eb2d6d5
commit 4666014f58
2 changed files with 72 additions and 108 deletions
Show Stats Download Patch File Download Diff File

103
buildpacker.py → buildlab.py
Unescape View File

@ -1,8 +1,8 @@
#!/usr/bin/env python3
import argparse
import datetime
import glob
import logging
import os
import shutil
import subprocess
@ -10,46 +10,12 @@ import sys
scriptdir = os.path.dirname(os.path.realpath(__file__))
debug = False
verbose = False
# TODO: use logging module?
def strace():
import pdb
pdb.set_trace()
def debugprint(message):
global debug
if debug:
print("DEBUG: " + message)
def verboseprint(message):
global verbose
if verbose:
print("VERBOSE: " + message)
def resolvepath(path):
return os.path.realpath(os.path.normpath(os.path.expanduser(path)))
def which(commandname):
def is_exe(fpath):
return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
for path in os.environ["PATH"].split(os.pathsep):
path = path.strip('"')
exe_file = os.path.join(path, commandname)
if is_exe(exe_file):
return exe_file
print("Exe path is {}".format(exe_file))
raise Exception("No such command '{}' in %PATH%".format(commandname))
def buildpacker(packerfile, outdir, force=False, whatif=False):
packerfile = resolvepath(packerfile)
if not os.path.isfile(packerfile):
@ -70,9 +36,7 @@ def buildpacker(packerfile, outdir, force=False, whatif=False):
else:
raise Exception("A packer output directory exists at '{}'".format(oldoutput))
caryatidpath = resolvepath("~/Documents/caryatid")
caryatiddestination = resolvepath("D:\\Micah\\Vagrant")
cli = 'packer.exe build -var output_directory="{}" -var caryatidpath="{}" -var caryatid_destination="{}" {}'.format(outdir, caryatidpath, caryatiddestination, packerfile)
cli = 'packer.exe build -var output_directory="{}" {}'.format(outdir, packerfile)
# NOTE: Packer gives a very weird error if you do not COPY the entire environment
# When I was setting env to be just a dictionary with the PACKER_* variables I needed,
@ -86,11 +50,10 @@ def buildpacker(packerfile, outdir, force=False, whatif=False):
env['PACKER_LOG_PATH'] = logdir
env['CHECKPOINT_DISABLE'] = '1'
verboseprint("Running command:\n {}\n from directory: {}\n with environment:\n {}".format(cli, packerdir, env))
logging.info("Running command:\n {}\n from directory: {}\n with environment:\n {}".format(cli, packerdir, env))
if whatif:
return
else:
subprocess.check_call(cli, env=env, cwd=packerdir)
subprocess.check_call(cli, env=env, cwd=packerdir)
boxes = glob.glob("{}/*.box".format(outdir))
if len(boxes) > 1:
@ -98,18 +61,8 @@ def buildpacker(packerfile, outdir, force=False, whatif=False):
elif len(boxes) < 1:
raise Exception("Apparently the packer process failed, no boxes were created")
verboseprint("Packed .box file: '{}'".format(boxes[0]))
def add2caryatid(name, description, version, provider, artifact, backend, destination, extension=None):
"""Add a box to a JSON catalog using Caryatid
This is a temporary hack until we can get shell-local (or something similar) working on Windows
"""
import importlib.util
caryatidspec = importlib.util.spec_from_file_location("caryatid", resolvepath("~/Documents/caryatid/caryatid.py"))
caryatid = importlib.util.module_from_spec(caryatidspec)
caryatidspec.loader.exec_module(caryatid)
caryatid.addcopy(name, description, version, provider, artifact, destination)
logging.info("Packed .box file: '{}'".format(boxes[0]))
return boxes[0]
def addvagrantbox(vagrantboxname, packedboxpath, force, whatif):
@ -122,7 +75,7 @@ def addvagrantbox(vagrantboxname, packedboxpath, force, whatif):
forcearg = '--force' if force else ''
cli = "vagrant.exe box add {} --name {} {}".format(forcearg, vagrantboxname, packedboxname)
print("Running caryatid:\n {}".format(cli))
print("Running vagrant:\n {}".format(cli))
if whatif:
return
else:
@ -136,14 +89,14 @@ def main(*args, **kwargs):
parser.add_argument(
"baseconfigname", action='store',
help="The name of one of the subdirs of this directory, like windows_81_x86")
help="The name of one of the subdirs of the 'packer' directory, like windows_81_x86")
parser.add_argument(
"--base-out-dir", "-o", action='store', default="~/Documents/WinTrialLab",
"--base-out-dir", "-o", action='store', default="{}/output".format(scriptdir),
help="The base output directory, where Packer does its work and saves its final output. (NOT the VM directory, which is a setting in VirtualBox.)")
parser.add_argument(
"--action", "-a", action='store', default="packercaryatid",
choices=['packer', 'vagrant', 'caryatid', 'packervagrant', 'packercaryatid'],
"--action", "-a", action='store', default="packervagrant",
choices=['packer', 'vagrant', 'packervagrant'],
help="The action to perform. By default, build with packer and add to vagrant.")
parser.add_argument(
"--whatif", "-w", action='store_true',
@ -151,50 +104,24 @@ def main(*args, **kwargs):
parser.add_argument(
"--force", "-f", action='store_true',
help="Force continue, even if old output directories already exist")
parser.add_argument(
"--debug", "-d", action='store_true',
help="Print debug and verbose messages")
parser.add_argument(
"--verbose", "-v", action='store_true',
help="Print verbose messages")
parsed = parser.parse_args()
if parsed.debug:
global debug
debug = True
if parsed.debug or parsed.verbose:
global verbose
verbose = True
if parsed.action == "packervagrant":
actions = ['packer', 'vagrant']
elif parsed.action == "packercaryatid":
actions = ['packer', 'caryatid']
else:
actions = [parsed.action]
if parsed.verbose:
logging.basicConfig(level=logging.DEBUG)
fullconfigname = "wintriallab-{}".format(parsed.baseconfigname)
packeroutdir = os.path.join(resolvepath(parsed.base_out_dir), fullconfigname)
packerfile = os.path.join(scriptdir, 'packer', parsed.baseconfigname, '{}_packerfile.json'.format(parsed.baseconfigname))
if 'packer' in actions:
if 'packer' in parsed.action:
buildpacker(packerfile, packeroutdir, force=parsed.force, whatif=parsed.whatif)
packedboxpath = glob.glob("{}/{}_*_virtualbox.box".format(packeroutdir, parsed.baseconfigname))[0]
if 'vagrant' in actions:
if 'vagrant' in parsed.action:
addvagrantbox(fullconfigname, packedboxpath, force=parsed.force, whatif=parsed.whatif)
if 'caryatid' in actions:
now = datetime.datetime.now()
add2caryatid(
'wintriallab-win10-32',
'Windows Trial Lab: Windows 10 32-bit',
# '1.{}.{}'.format(now.strftime('%Y%m%d'), now.strftime('%H%M%S')),
'1.0.{}'.format(now.strftime('%Y%m%d%H%M%S')),
'virtualbox',
packedboxpath,
'copy',
'E:\\Micah\\caryatid')
if __name__ == '__main__':

49
readme.markdown
Unescape View File

@ -1,5 +1,48 @@
windows-trial-lab: scripts for building one or more machines from Windows trial ISOs
## Prerequisites
- Python (for the buildlab script)
- VirtualBox
- Packer
- Vagrant
## Using buildlab
The buildlab script is just a wrapper script around packer.exe and vagrant.exe. It can build a packer image and import it into vagrant.
> .\buildlab.py -h
usage: buildlab.py [-h] [--base-out-dir BASE_OUT_DIR]
[--action {packer,vagrant,packervagrant}] [--whatif]
[--force] [--verbose]
baseconfigname
Windows Trial Lab: build trial Vagrant boxes.
positional arguments:
baseconfigname The name of one of the subdirs of the 'packer'
directory, like windows_81_x86
optional arguments:
-h, --help show this help message and exit
--base-out-dir BASE_OUT_DIR, -o BASE_OUT_DIR
The base output directory, where Packer does its work
and saves its final output. (NOT the VM directory,
which is a setting in VirtualBox.)
--action {packer,vagrant,packervagrant}, -a {packer,vagrant,packervagrant}
The action to perform. By default, build with packer
and add to vagrant.
--whatif, -w Do not perform any actions, only say what would have
been done
--force, -f Force continue, even if old output directories already
exist
--verbose, -v Print verbose messages
NOTE: requires packer 0.8.6 or higher and vagrant 1.8 or higher. EXAMPLE:
buildlab --baseconfigname windows_10_x86; cd vagrant/FreyjaA; vagrant up
Note that doing the actual `vagrant up` is not part of buildlab - it only makes the box available for you to `vagrant up` later. See my example Vagrant boxes in the vagrant subdirectory, but note that these will be specific to my use; you'll probably want to define your own Vagrantfile(s) with your own provisioner scripts.
## Credits
This started as some customizations for [joefitzgerald/packer-windows](https://github.com/joefitzgerald/packer-windows) that got a liiiiiiiittle out of hand.
@ -42,11 +85,6 @@ And these are some specific changes that may impact you
## To do
buildlab.ps1 improvements:
- would like to use the -tag in the name for the vagrant box too, but that requires parameterizing both the packerfile and the vagrantfile template :/ not sure what to do about this
- I have a concept of "packer basename" and "tag" in buildlab. Extend this to also have "architecture" and "flavor" (or something - to capture Server Standard vs Core vs Datacenter etc)
packer/vagrant/postinstall improvements:
- store passwords securely for shit and/or generate them on the fly
@ -78,4 +116,3 @@ upstream improvements
- The original packer-windows crew got aroudn this by using the `Run` key and disabling UAC in `Autounattend.xml`
- I'm planning to get around this by creating a scheduled task that starts at boot and runs with highest privileges. This won't work pre-Vista/2008, but that's OK with me.
- This means I need to write an executor that can start at boot, and then check for things to execute located elsewhere. Bleh.

Write Preview
Loading…
Cancel
Save