From 13cfcc482499ed069a48fc84b3039113a8cfd144 Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Sun, 30 Dec 2012 12:11:41 -0800 Subject: Remove dog-tag and ipa ideosynchracies --- python-scripts/build-nss.py | 10 ++--- python-scripts/build_functions.py | 85 +++++---------------------------------- 2 files changed, 16 insertions(+), 79 deletions(-) diff --git a/python-scripts/build-nss.py b/python-scripts/build-nss.py index 70a9533..77c4907 100755 --- a/python-scripts/build-nss.py +++ b/python-scripts/build-nss.py @@ -108,9 +108,9 @@ parser.add_argument( action="store", dest="mockCfgList", nargs='+', - default=["rhel-6-i386", "rhel-6-x86_64"], - help='spcify a list of one or more mock configs to use. [default = rhel-6-i386", "rhel-6-x86_64]', - choices=("rhel-6-i386", "rhel-6-x86_64")) + default=["fedora-rawhide-i386", "fedora-rawhide-x86_64"], + help='spcify a list of one or more mock configs to use. [default = fedora-rawhide-i386", "fedora-rawhide-x86_64]', + choices=("fedora-rawhide-i386", "fedora-rawhide-x86_64")) options = parser.parse_args() #if args.servername is None and not args.dry_run: @@ -232,8 +232,8 @@ if options.skipBuild is False: for mock_cfg in mockCfgList: [platform, rel, arch] = mock_cfg.split("-") if rel == "18": - nssPackageList.append("pki-tps") - print_debug("Adding pki-tps to list of packages to build for %s %s" % (platform, rel)) + nssPackageList.append("xulrunner") + print_debug("Adding xulrunner to list of packages to build for %s %s" % (platform, rel)) print_debug("nssPackageList = %s" % nssPackageList) for package in nssPackageList: #status = build_pki(package, buildDir, mock_cfg, flavor, scriptsDir, options.debug, mailTo) diff --git a/python-scripts/build_functions.py b/python-scripts/build_functions.py index adad8f2..9384c12 100755 --- a/python-scripts/build_functions.py +++ b/python-scripts/build_functions.py @@ -22,11 +22,11 @@ def email(message, mailTo): receivers=mailTo #if options_mailMe: - # receivers = 'kwright@redhat.com' + # receivers = 'emaldona@redhat.com' #else: - # receivers = 'ipa-and-samba-team-automation@redhat.com' + # receivers = 'nss-pem-devel@lists.fedorahosted.org' - sender = 'kwright@redhat.com' + sender = 'emaldona@redhat.com' #print socket.gethostname() hostname = socket.gethostname() @@ -294,70 +294,6 @@ def build_package(package, mock_cfg, gitrev, buildDir, group, options_debug, mai #end build_package() ########################################################################################## -def build_pki(package, buildDir, mock_cfg, flavor, scriptsDir, options_debug, mailTo): - def print_debug(msg): - if options_debug == True: - print "DEBUG: %s" % (msg) - print "INFO: Building package %s in %s for %s: %s" % (package, buildDir, mock_cfg, flavor) - if not os.path.exists(buildDir): - os.makedirs(buildDir) - os.chdir(buildDir) - pkiScriptsDir = buildDir + "/pki/scripts" - if not os.path.exists(pkiScriptsDir): - print "INFO: Getting the sources for %s" % package - git.Git().clone("git://git.fedorahosted.org/git/pki.git") - #else: - pkiGitDir = buildDir + "/pki" - os.chdir(pkiGitDir) - g = git.Git(pkiGitDir) - print g.log('--pretty=%h','-1','--').split('\n') - gitrev = g.log('--pretty=%h','-1','--').split('\n')[0] - print_debug(gitrev) - print_debug(type(gitrev)) - #[gitrev, stuff1, stuff2] = g.log('--pretty=%h','-1','--').split('\n') - #gitrev2=gitrev[0] - #print type(gitrev2) - #gitrev=gitrev2 - #sys.exit() - print "INFO: git rev = %s" % gitrev - - srpmPattern = r'^%s\-\d*?\S*?\.*?\.rpm$' % package - SRPMS = buildDir + "/packages/SRPMS/" - if not os.path.exists(SRPMS): - os.makedirs(SRPMS) - os.chdir(SRPMS) - print "INFO: List of src.rpms:\n" - os.listdir(SRPMS) - SRPM=None - for fileName in os.listdir(SRPMS): - if re.search(srpmPattern, fileName): - print fileName - SRPM = fileName - if SRPM == None: - if package == "dogtag-pki": - srpmScript = scriptsDir + "/dogtag/build_" + package + "_srpm.sh" - print_debug("srpmScript: %s" % srpmScript) - shutil.copy(srpmScript, buildDir) - #cd ${BuildDir} && bash -x ./build_${PKG}_srpm.sh 2>&1 |tee ${BuildDir}/build_$PKG.srpm.log -#TODO add logging to a file - os.chdir(buildDir) - for line in runProcess([srpmScript]): - print line, - else: - print "INFO: package name to convert = %s" % package - under = re.compile('-') - srpmScript = under.sub('_', package) - #print srpmScript #TODO add the -x for DEBUG - #cd ${BuildDir}/pki/scripts/ && bash -x ${BuildDir}/pki/scripts/compose_${PKG_SCRIPT}_packages hybrid_srpm - os.chdir(pkiScriptsDir) - srpmScript = pkiScriptsDir + "/compose_" + srpmScript + "_packages" - print srpmScript - for line in runProcess([srpmScript, 'hybrid_srpm']): - print line, - status = build_package(package, mock_cfg, gitrev, buildDir, flavor, options_debug, mailTo) - print "Build status = %s for %s " % (status, package) - return status -#end build_pki() ########################################################################################## def build_generic_pkg(package, buildDir, mock_cfg, flavor, scriptsDir, options_debug, mailTo): @@ -386,7 +322,7 @@ def build_generic_pkg(package, buildDir, mock_cfg, flavor, scriptsDir, options_d print fileName SRPM = fileName if SRPM == None: - srpmScript = scriptsDir + "/build_" + package + ".sh" + srpmScript = scriptsDir + "/nss/build_" + package + ".sh" print_debug("srpmScript = %s" % srpmScript) shutil.copy(srpmScript, buildDir) os.chdir(buildDir) @@ -463,7 +399,7 @@ def createRepoDirs(mock_cfg, flavor, DT, buildDir, options_test, options_debug, dist=platform + rel print_debug("dist: %s" % dist) -#TODO send an email the the build faild due to not being able to mount repos +#TODO send email informing of a build failure due to not being able to mount repos if options_test: repos = "/tmp/repos" else: @@ -478,14 +414,14 @@ def createRepoDirs(mock_cfg, flavor, DT, buildDir, options_test, options_debug, sys.exit() #TODO: handle other flavor names for future builds - if flavor == "DOGTAG 10": + if flavor == "NSS": #/repos/pki/dogtag/10 [flavorName, flavorGroup] = flavor.split() flavorName=flavorName.lower() repoBase=os.path.join(repos, repoPackage, flavorName, flavorGroup) repoFull=os.path.join(repoBase, dist) else: - flavorName="IPA" + flavorName="NSS" flavorGroup="devel" flavorName=flavorName.lower() repoBase=os.path.join(repos, repoPackage, flavorName, flavorGroup) @@ -591,7 +527,7 @@ def copyToRepo(mock_cfg, flavor, DT, buildDir, options_test, options_debug, opti dist=platform + rel print_debug("dist: %s" % dist) -#TODO send an email the the build faild due to not being able to mount repos +#TODO send email that build failed due to not being able to mount repos if options_test: repos = "/tmp/repos" else: @@ -606,7 +542,7 @@ def copyToRepo(mock_cfg, flavor, DT, buildDir, options_test, options_debug, opti sys.exit() #TODO: handle other flavor names for future builds - if flavor == "DOGTAG 10": + if flavor == "NSS": [flavorName, flavorGroup] = flavor.split() flavorName=flavorName.lower() repoBase=os.path.join(repos, repoPackage, flavorName, flavorGroup) @@ -677,7 +613,8 @@ def copyToRepo(mock_cfg, flavor, DT, buildDir, options_test, options_debug, opti ################################################################# #copy the builds over to the newly created repo tree ################################################################# -#TODO add some logic for the case where the only build is a noarch and there are no arch build (dogtag-pki) +#TODO add some logic for the case where the only build is a noarch and +# there are no arch build (dogtag-pki) #currently, this creates an empty log file for fileList_i686 # /tmp/repos/pki/dogtag/10/F17/20120913-150042/i686/logs/fileList_i686 -- cgit