rel-eng/global.build.py.props | 19 -------------------
rel-eng/koji-missing-builds.py | 4 ++--
rel-eng/lib/spacewalk/releng/builder.py | 17 +++++++++++++----
rel-eng/lib/spacewalk/releng/cli.py | 8 +++++++-
rel-eng/tito.props | 12 ++++++++++++
5 files changed, 34 insertions(+), 26 deletions(-)
New commits:
commit aa0fa396eca4d732f656bd1afc5cfd9bd146b137
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Mon Mar 30 16:52:03 2009 -0300
Add support for koji tag whitelist in tito.props.
If present implies all packages *not* listed in the whitelist are
blacklisted.
diff --git a/rel-eng/lib/spacewalk/releng/builder.py
b/rel-eng/lib/spacewalk/releng/builder.py
index 954000c..67b794e 100644
--- a/rel-eng/lib/spacewalk/releng/builder.py
+++ b/rel-eng/lib/spacewalk/releng/builder.py
@@ -268,12 +268,21 @@ class Builder(object):
for koji_tag in koji_tags:
# Lookup the disttag configured for this Koji tag:
disttag = self.global_config.get(koji_tag, "disttag")
- if self.global_config.has_option(koji_tag, "blacklist"):
+ if self.global_config.has_option(koji_tag, "whitelist"):
+ # whitelist implies only those packages can be built to the
+ # tag,regardless if blacklist is also defined.
+ if self.project_name not in self.global_config.get(koji_tag,
+ "whitelist").strip().split(" "):
+ print("WARNING: %s not specified in whitelist for %s" % (
+ self.project_name, koji_tag))
+ print(" Package *NOT* submitted to Koji.")
+ continue
+ elif self.global_config.has_option(koji_tag, "blacklist"):
if self.project_name in self.global_config.get(koji_tag,
"blacklist").strip().split(" "):
print("WARNING: %s specified in blacklist for %s" % (
self.project_name, koji_tag))
- print("WARNING: NOT submitting this srpm to koji.")
+ print(" Package *NOT* submitted to Koji.")
continue
# Getting tricky here, normally Builder's are only used to
commit e81d9ffee3b32018c8b1d6308475f87df1f5594d
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Mon Mar 30 15:47:46 2009 -0300
tito: Change ignore_pkgs option to blacklist.
Doing this to jive with whitelist option coming soon.
diff --git a/rel-eng/koji-missing-builds.py b/rel-eng/koji-missing-builds.py
index cfc4514..424ad38 100755
--- a/rel-eng/koji-missing-builds.py
+++ b/rel-eng/koji-missing-builds.py
@@ -42,8 +42,8 @@ distsuffix = ''
tag = args[0]
disttag = distmap[tag.split('-')[1]]
pkgstoignore = []
-if config.has_section(tag) and config.has_option(tag, 'ignore_pkgs'):
- pkgstoignore = config.get(tag, 'ignore_pkgs').split(' ')
+if config.has_section(tag) and config.has_option(tag, 'blacklist'):
+ pkgstoignore = config.get(tag, 'blacklist').split(' ')
if opts.brew:
mysession =
koji.ClientSession("http://brewhub.devel.redhat.com/brewhub")
diff --git a/rel-eng/lib/spacewalk/releng/builder.py
b/rel-eng/lib/spacewalk/releng/builder.py
index 5a42d24..954000c 100644
--- a/rel-eng/lib/spacewalk/releng/builder.py
+++ b/rel-eng/lib/spacewalk/releng/builder.py
@@ -268,10 +268,10 @@ class Builder(object):
for koji_tag in koji_tags:
# Lookup the disttag configured for this Koji tag:
disttag = self.global_config.get(koji_tag, "disttag")
- if self.global_config.has_option(koji_tag, "ignore_pkgs"):
+ if self.global_config.has_option(koji_tag, "blacklist"):
if self.project_name in self.global_config.get(koji_tag,
- "ignore_pkgs").strip().split(" "):
- print("WARNING: %s specified in ignore_pkgs for %s" % (
+ "blacklist").strip().split(" "):
+ print("WARNING: %s specified in blacklist for %s" % (
self.project_name, koji_tag))
print("WARNING: NOT submitting this srpm to koji.")
continue
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 7da0f88..ce9e025 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -5,13 +5,6 @@ default_tagger = spacewalk.releng.tagger.VersionTagger
[koji]
autobuild_tags = dist-f10-sw-0.5-candidate dist-5E-sw-0.5-candidate
-# to exclude packages from being listed in a missing
-# builds report simply add the package name to the
-# list in the appropriate tag section
-# [kojiorbrewtag]
-# ignore_missing=space seperated list of packagenames
-# i.e. ignore_missing=yum-rhn-plugin oracle-selinux
-
[dist-f10-sw-0.5-candidate]
disttag = .fc10
commit caea7085c7bfab65aa71155226a077a32b047f04
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Mon Mar 30 15:28:22 2009 -0300
tito: Use tito.props instead of global.build.py.props.
diff --git a/rel-eng/global.build.py.props b/rel-eng/global.build.py.props
deleted file mode 100644
index 7da0f88..0000000
--- a/rel-eng/global.build.py.props
+++ /dev/null
@@ -1,19 +0,0 @@
-[globalconfig]
-default_builder = spacewalk.releng.builder.Builder
-default_tagger = spacewalk.releng.tagger.VersionTagger
-
-[koji]
-autobuild_tags = dist-f10-sw-0.5-candidate dist-5E-sw-0.5-candidate
-
-# to exclude packages from being listed in a missing
-# builds report simply add the package name to the
-# list in the appropriate tag section
-# [kojiorbrewtag]
-# ignore_missing=space seperated list of packagenames
-# i.e. ignore_missing=yum-rhn-plugin oracle-selinux
-
-[dist-f10-sw-0.5-candidate]
-disttag = .fc10
-
-[dist-5E-sw-0.5-candidate]
-disttag = .el5
diff --git a/rel-eng/lib/spacewalk/releng/cli.py b/rel-eng/lib/spacewalk/releng/cli.py
index 9105678..7b40068 100644
--- a/rel-eng/lib/spacewalk/releng/cli.py
+++ b/rel-eng/lib/spacewalk/releng/cli.py
@@ -37,7 +37,7 @@ from spacewalk.releng.common import find_git_root, run_command, \
check_tag_exists, get_latest_tagged_version
BUILD_PROPS_FILENAME = "build.py.props"
-GLOBAL_BUILD_PROPS_FILENAME = "global.build.py.props"
+GLOBAL_BUILD_PROPS_FILENAME = "tito.props"
GLOBALCONFIG_SECTION = "globalconfig"
DEFAULT_BUILDER = "default_builder"
DEFAULT_TAGGER = "default_tagger"
@@ -175,6 +175,12 @@ class BaseCliModule(object):
"""
rel_eng_dir = os.path.join(find_git_root(), "rel-eng")
filename = os.path.join(rel_eng_dir, GLOBAL_BUILD_PROPS_FILENAME)
+ if not os.path.exists(filename):
+ # HACK: Try the old filename location, pre-tito rename:
+ filename = os.path.join(rel_eng_dir, "global.build.py.props")
+ if not os.path.exists(filename):
+ error_out("Unable to locate branch configuration: %s" %
+ filename)
config = ConfigParser.ConfigParser()
config.read(filename)
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
new file mode 100644
index 0000000..7da0f88
--- /dev/null
+++ b/rel-eng/tito.props
@@ -0,0 +1,19 @@
+[globalconfig]
+default_builder = spacewalk.releng.builder.Builder
+default_tagger = spacewalk.releng.tagger.VersionTagger
+
+[koji]
+autobuild_tags = dist-f10-sw-0.5-candidate dist-5E-sw-0.5-candidate
+
+# to exclude packages from being listed in a missing
+# builds report simply add the package name to the
+# list in the appropriate tag section
+# [kojiorbrewtag]
+# ignore_missing=space seperated list of packagenames
+# i.e. ignore_missing=yum-rhn-plugin oracle-selinux
+
+[dist-f10-sw-0.5-candidate]
+disttag = .fc10
+
+[dist-5E-sw-0.5-candidate]
+disttag = .el5