lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add chown argument to change build dir owner

Browse Source 
This allows Jenkins to delete a sudo build.
This commit is contained in:
Bob Lantz
2016-01-13 17:16:07 -08:00
parent 38a4000a97
commit f873068a2c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/vm/build.py
+11 -4
View File
@@ -54,6 +54,7 @@ NoKVM = False # Don't use kvm and use emulation instead
Branch = None # Branch to update and check out before testing Branch = None # Branch to update and check out before testing
Zip = False # Archive .ovf and .vmdk into a .zip file Zip = False # Archive .ovf and .vmdk into a .zip file
Forward = [] # VM port forwarding options (-redir) Forward = [] # VM port forwarding options (-redir)
Chown = '' # Build directory owner
VMImageDir = os.environ[ 'HOME' ] + '/vm-images' VMImageDir = os.environ[ 'HOME' ] + '/vm-images'
@@ -774,18 +775,20 @@ def build( flavor='raring32server', tests=None, pre='', post='', memory=1024 ):
post: command line to run in VM after tests post: command line to run in VM after tests
prompt: shell prompt (default '$ ') prompt: shell prompt (default '$ ')
memory: memory size in MB""" memory: memory size in MB"""
global LogFile, Zip global LogFile, Zip, Chown
start = time() start = time()
lstart = localtime() lstart = localtime()
date = strftime( '%y%m%d-%H-%M-%S', lstart) date = strftime( '%y%m%d-%H-%M-%S', lstart)
ovfdate = strftime( '%y%m%d', lstart ) ovfdate = strftime( '%y%m%d', lstart )
dir = 'mn-%s-%s' % ( flavor, date ) dir = 'mn-%s-%s' % ( flavor, date )
if Branch: if Branch:
dir = 'mn-%s-%s-%s' % ( Branch, flavor, date ) dirname = 'mn-%s-%s-%s' % ( Branch, flavor, date )
try: try:
os.mkdir( dir ) os.mkdir( dir)
except: except:
raise Exception( "Failed to create build directory %s" % dir ) raise Exception( "Failed to create build directory %s" % dir )
if Chown:
run( 'chown %s %s' % ( Chown, dir ) )
os.chdir( dir ) os.chdir( dir )
LogFile = open( 'build.log', 'w' ) LogFile = open( 'build.log', 'w' )
log( '* Logging to', abspath( LogFile.name ) ) log( '* Logging to', abspath( LogFile.name ) )
@@ -935,7 +938,7 @@ def testString():
def parseArgs(): def parseArgs():
"Parse command line arguments and run" "Parse command line arguments and run"
global LogToConsole, NoKVM, Branch, Zip, TIMEOUT, Forward global LogToConsole, NoKVM, Branch, Zip, TIMEOUT, Forward, Chown
parser = argparse.ArgumentParser( description='Mininet VM build script', parser = argparse.ArgumentParser( description='Mininet VM build script',
epilog=buildFlavorString() + ' ' + epilog=buildFlavorString() + ' ' +
testString() ) testString() )
@@ -975,6 +978,8 @@ def parseArgs():
help='output file for test image (vmdk)' ) help='output file for test image (vmdk)' )
parser.add_argument( '-f', '--forward', default=[], action='append', parser.add_argument( '-f', '--forward', default=[], action='append',
help='forward VM ports to local server, e.g. tcp:5555::22' ) help='forward VM ports to local server, e.g. tcp:5555::22' )
parser.add_argument( '-u', '--chown', metavar='user',
help='specify an owner for build directory' )
args = parser.parse_args() args = parser.parse_args()
if args.depend: if args.depend:
depend() depend()
@@ -996,6 +1001,8 @@ def parseArgs():
Forward = args.forward Forward = args.forward
if not args.test and not args.run and not args.post: if not args.test and not args.run and not args.post:
args.test = [ 'sanity', 'core' ] args.test = [ 'sanity', 'core' ]
if args.chown:
Chown = args.chown
for flavor in args.flavor: for flavor in args.flavor:
if flavor not in isoURLs: if flavor not in isoURLs:
print "Unknown build flavor:", flavor print "Unknown build flavor:", flavor