11:15 a.m.
Fedora changed CVS for GIT, email opt-in is no longer applicable, let's
disable it. Also remove collection_name items from repoinfo.conf, they
are not needed anymore.
---
hooks/post-koji-build/watch-koji-builds.py | 2 +-
lib/python/repoinfo.py | 1 -
lib/python/util.py | 16 ----------------
repoinfo.conf | 16 ----------------
tests/initscripts/initscripts.py | 4 ----
tests/rpmguard/rpmguard.py | 4 ----
tests/rpmlint/rpmlint.py | 4 ----
7 files changed, 1 insertions(+), 46 deletions(-)
diff --git a/hooks/post-koji-build/watch-koji-builds.py
b/hooks/post-koji-build/watch-koji-builds.py
index 43369f6..a3f9467 100755
--- a/hooks/post-koji-build/watch-koji-builds.py
+++ b/hooks/post-koji-build/watch-koji-builds.py
@@ -112,7 +112,7 @@ tags for new builds and kick off tests when new builds/packages are
found.')
taglist = set()
for repo in repoinfo.repos():
# Always include the tag for the development branch (aka rawhide)
- if repoinfo.get(repo, "collection_name") == "devel":
+ if repo == 'rawhide':
taglist.add(repoinfo.get(repo, "tag"))
# otherwise, find all *-updates-candidate tags to include
# NOTE: This assumes that updates are tagged in the format
diff --git a/lib/python/repoinfo.py b/lib/python/repoinfo.py
index 420becc..1438885 100644
--- a/lib/python/repoinfo.py
+++ b/lib/python/repoinfo.py
@@ -52,7 +52,6 @@ class RepoinfoConfig(object):
'url': self.config.get(name,'url'),
'path': self.config.get(name,'path'),
'name': name, # kind of unnecessary
- 'collection_name': self.config.get(name,
'collection_name'),
'composes': self.config.get(name,'composes'),
}
return repo
diff --git a/lib/python/util.py b/lib/python/util.py
index ed90ba4..75d5539 100644
--- a/lib/python/util.py
+++ b/lib/python/util.py
@@ -93,22 +93,6 @@ def checkhash(filename, algo, hexdigest):
hasher.hexdigest() == hexdigest)
return r
-def check_opt_in(pkgname, dist_release):
- """take a package name and distribution release and check for an
autoqa-optin file"""
-
- url = 'http://fedorapeople.org/packages/'
- fullurl = url + '%s/%s/%s/autoqa-optin' % (pkgname[0].lower(), pkgname,
dist_release)
- tmout = socket.getdefaulttimeout()
- socket.setdefaulttimeout(10) # if it takes more than that, just consider as not opted
in
- try:
- h = urllib.urlopen(fullurl)
- except IOError, e:
- return False
- finally:
- socket.setdefaulttimeout(tmout)
-
- return h.getcode() == 200 # file exists (HTTP 200 OK)
-
grabber = urlgrabber.grabber.URLGrabber()
if hasattr(sys.stdout, "fileno") and os.isatty(sys.stdout.fileno()):
diff --git a/repoinfo.conf b/repoinfo.conf
index 3241044..a532775 100644
--- a/repoinfo.conf
+++ b/repoinfo.conf
@@ -15,94 +15,78 @@ arches = i386, x86_64
path = development/rawhide
url = %(rawhideurl)s
tag = dist-f15
-collection_name = devel
# Fedora 14
[f14]
path = development/14
url = %(rawhideurl)s
-collection_name = F-14
[f14-updates]
path = 14
url = %(updatesurl)s
parents = f14
-collection_name = F-14
[f14-updates-testing]
path = testing/14
url = %(updatesurl)s
parents = f14-updates, f14
-collection_name = F-14
# Fedora 13
[f13]
path = 13
url = %(goldurl)s
-collection_name = F-13
[f13-updates]
path = 13
url = %(updatesurl)s
parents = f13
-collection_name = F-13
[f13-updates-testing]
path = testing/13
url = %(updatesurl)s
parents = f13-updates, f13
-collection_name = F-13
# Fedora 12
[f12]
path = 12
url = %(goldurl)s
-collection_name = F-12
[f12-updates]
path = 12
url = %(updatesurl)s
parents = f12
-collection_name = F-12
[f12-updates-testing]
path = testing/12
url = %(updatesurl)s
parents = f12-updates, f12
-collection_name = F-12
# Fedora 11
[f11]
path = 11
url = %(goldurl)s
-collection_name = F-11
[f11-updates]
path = 11
url = %(updatesurl)s
parents = f11
-collection_name = F-11
[f11-updates-testing]
path = testing/11
url = %(updatesurl)s
parents = f11-updates, f11
-collection_name = F-11
# Fedora 10
[f10]
path = 10
url = %(goldurl)s
-collection_name = F-10
[f10-updates]
path = 10
url = %(updatesurl)s
parents = f10
-collection_name = F-10
[f10-updates-testing]
path = testing/10
url = %(updatesurl)s
parents = f10-updates, f10
-collection_name = F-10
diff --git a/tests/initscripts/initscripts.py b/tests/initscripts/initscripts.py
index fcef479..a9504b0 100644
--- a/tests/initscripts/initscripts.py
+++ b/tests/initscripts/initscripts.py
@@ -155,10 +155,6 @@ class initscripts(test.test):
mail_server = self.config.get('test', 'smtpserver')
if (mail_to and mail_from and mail_server):
mail_to = mail_to.split(',')
- collection_name =
repoinfo.getrepo_by_tag(kojitag)['collection_name']
- if collection_name and autoqa.util.check_opt_in(name, collection_name):
- #FIXME - hardcoded partial email address here - obviously sub-par
- mail_to.append('%s-owner(a)fedoraproject.org' % name)
msg = "Stored logs available at <%s>\n\n" %
self.autotest_url
msg += "Following tests returned zero exit code: %s\n" %
repr(tests_exit_status_zero)
diff --git a/tests/rpmguard/rpmguard.py b/tests/rpmguard/rpmguard.py
index 50245b9..18da580 100644
--- a/tests/rpmguard/rpmguard.py
+++ b/tests/rpmguard/rpmguard.py
@@ -183,10 +183,6 @@ rpmlint | cut -d ' ' -f 1", retain_output=True)
result_email = self.config.get('test','result_email')
if result_email and isinstance(result_email, str):
send_to = result_email.split(',')
- collection_name =
repoinfo.getrepo_by_tag(kojitag)['collection_name']
- if collection_name and autoqa.util.check_opt_in(name, collection_name):
- #FIXME - hardcoded partial email address here - obviously sub-par
- send_to.append('%s-owner(a)fedoraproject.org' % name)
if send_to:
warning_count = len([line for line in log.splitlines() \
diff --git a/tests/rpmlint/rpmlint.py b/tests/rpmlint/rpmlint.py
index bbb7460..6d3434a 100644
--- a/tests/rpmlint/rpmlint.py
+++ b/tests/rpmlint/rpmlint.py
@@ -67,10 +67,6 @@ class rpmlint(test.test):
result_email = self.config.get('test','result_email')
if result_email and isinstance(result_email, str):
send_to = result_email.split(',')
- collection_name =
repoinfo.getrepo_by_tag(kojitag)['collection_name']
- if collection_name and autoqa.util.check_opt_in(name, collection_name):
- #FIXME - hardcoded partial email address here - obviously sub-par
- send_to.append('%s-owner(a)fedoraproject.org' % name)
if send_to:
# parse last line for summary ('N errors, N warnings')
--
1.7.2