diff options
| -rwxr-xr-x | build-nss.py | 23 | ||||
| -rwxr-xr-x | build_functions.py | 50 | ||||
| -rwxr-xr-x | prepare-all-srpms.sh | 2 |
3 files changed, 59 insertions, 16 deletions
diff --git a/build-nss.py b/build-nss.py index 5cb463d..b8b05ff 100755 --- a/build-nss.py +++ b/build-nss.py @@ -10,11 +10,13 @@ print os.environ.get("USER") parser = argparse.ArgumentParser( description='Automate NSS builds using mock.', - version = '0.9 beta', add_help=True, conflict_handler='resolve', epilog='Program designed to be used both on the command line or by cron') +parser.add_argument("-ver", "--version", + action='version', default= "0.9 beta", + help="set version number") parser.add_argument("-d", "--debug", action="store_true", default=True, @@ -211,20 +213,11 @@ buildStatusDict={} if options.skipBuild is False: for mock_cfg in mockCfgList: [platform, rel, arch] = mock_cfg.split("-") - for package in nssPackageList: - status = build_generic_pkg(package, buildDir, mock_cfg, flavor, scriptsDir, options.debug, mailTo) - buildStatusDict[(package,mock_cfg)]=status -#################### -#hope this line works - print_debug("%s" % json.dumps(str(buildStatusDict), sort_keys=True, indent=4)) -#################### - print_debug("package %s completed with status %s for %s" % (package, status, mock_cfg)) - - if len(clientPackageList) > 0: - for client in clientPackageList: - status = build_generic_pkg(client, buildDir, mock_cfg, flavor, scriptsDir, options.debug, mailTo) - print_debug("%s" % json.dumps(str(buildStatusDict), sort_keys=True, indent=4)) - print_debug("package %s completed with status %s for %s" % (package, status, mock_cfg)) + package = "nss" + status = build_nss_pkgs(package, buildDir, mock_cfg, flavor, scriptsDir, options.debug, mailTo) + buildStatusDict[('nss',mock_cfg)]=status + print_debug("%s" % json.dumps(str(buildStatusDict), sort_keys=True, indent=4)) + print_debug("package %s completed with status %s for %s" % ('nss', status, mock_cfg)) # TODO fix issue with failed build not stopping creating the repo # NOTE the problem appears to be if the x86_64 bit builds all complete diff --git a/build_functions.py b/build_functions.py index d746957..8cd1419 100755 --- a/build_functions.py +++ b/build_functions.py @@ -298,6 +298,56 @@ def build_package(package, mock_cfg, gitrev, buildDir, group, optionsDebug, mail ########################################################################################## ########################################################################################## +def build_nss_pkgs( + package, + buildDir, + mock_cfg, + flavor, + scriptsDir, + optionsDebug, + mailTo): + def print_debug(msg): + if optionsDebug == True: + print "DEBUG: %s" % (msg) + + dashes = "+" + 70 * "-" + "+" + pounds = 70 * "#" + + def print_debug(msg): + if optionsDebug == True: + print "DEBUG: %s" % (msg) + + print_debug("package %s" % package) + print_debug("mock_cfg %s" % mock_cfg) + print_debug("buildDir %s" % buildDir) + #if os.path.isdir(os.path.join(buildDir, package, ".git")): + #if os.path.isdir(resultsDir): + buildLogs = os.path.join(buildDir,"build_logs", mock_cfg) + print_debug("buildLogs: %s" % buildLogs) + if not os.path.exists(buildLogs): + os.makedirs(buildLogs) + os.chdir(buildLogs) + + print_debug("cwd %s" % os.getcwd()) + print pounds + print "INFO: build_package() -> building %s for %s" % (package, mock_cfg) + print pounds + + print "package = %s " % package + print "+-----------------------------------------------------+" + print "Starting to build %s" % package + print "+-----------------------------------------------------+" + logFilePath = os.path.join(buildLogs, package + ".log") + logFile = open(logFilePath, "w") + status = 0 + for line in runProcess(['mock', '-v', '-r', mock_cfg, '--shell', 'build_nss.sh']): + logFile.write(line,) + print line, + print "Build status = %s for %s " % (status, package) + return status +#end build_nss_pkgs() + +########################################################################################## def build_generic_pkg( package, buildDir, diff --git a/prepare-all-srpms.sh b/prepare-all-srpms.sh index 66e4e2c..73e9e3f 100755 --- a/prepare-all-srpms.sh +++ b/prepare-all-srpms.sh @@ -12,7 +12,7 @@ checkout_and_srpm_pkgs() { fedpkg clone $p ${OPTION_BRANCH} --anonymous pushd $p fedpkg srpm - cp -p $p-*.src.rpm ../../packages/SRPMS + cp -p $p-*.src.rpm ../packages/SRPMS popd done } |