This patch kind of reverts fbe9ee91b. We don't want upgradepath to be run for -testing repos, because that would effectively prevent maintainers from pushing into -testing. They would need to wait until that package gets into stable updates in more recent Fedora releases, and we don't want that.
So the solution is not to schedule upgradepath for these update requests at all (at least until we have more complex upgradepath). That will fix the assertion error we had received.
I have one more concern with upgradepath, but I'll create a ticket for it tomorrow. This patch should work fine.
Kamil Páral (1): upgradepath doesn't support -testing repos yet, disable scheduling
tests/upgradepath/control.autoqa | 4 ++++ tests/upgradepath/upgradepath.py | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-)
Modify control file to disable scheduling of upgradepath for -testing kojitag. If the test is run with this kojitag, just report error. --- tests/upgradepath/control.autoqa | 4 ++++ tests/upgradepath/upgradepath.py | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/upgradepath/control.autoqa b/tests/upgradepath/control.autoqa index dc1293f..e63091a 100644 --- a/tests/upgradepath/control.autoqa +++ b/tests/upgradepath/control.autoqa @@ -8,3 +8,7 @@ archs = ['noarch'] if hook not in ['post-bodhi-update']: execute = False
+# don't check requests going into *-updates-testing, upgradepath currently +# doesn't support that +if autoqa_args.get('kojitag','').endswith('-testing'): + execute = False diff --git a/tests/upgradepath/upgradepath.py b/tests/upgradepath/upgradepath.py index cecf439..028b8aa 100755 --- a/tests/upgradepath/upgradepath.py +++ b/tests/upgradepath/upgradepath.py @@ -87,12 +87,11 @@ class upgradepath(AutoQATest): def run_once(self, envrs, kojitag, **kwargs): update_id = kwargs['name'] or kwargs['id']
- # Get a list of all repos we monitor + # Get a list of all repos we monitor (currently not -testing) # FIXME - perhaps we should only query for 'active' repos - reponames = [reponame for reponame in repoinfo.repos()] - # Get a list of koji-tags For all stable repos (includes the requested kojitag) - repotags = [repoinfo.getrepo(reponame)['tag'] for reponame in reponames \ - if not reponame.endswith('-testing') or repoinfo.getrepo(reponame)['tag'] == kojitag] + reponames = [reponame for reponame in repoinfo.repos() if not reponame.endswith('-testing')] + # Get a list of koji-tags + repotags = [repoinfo.getrepo(reponame)['tag'] for reponame in reponames] repotags.sort() assert kojitag in repotags, 'Requested unsupported kojitag: %s' % kojitag current_tag = repotags.index(kojitag)
On Thu, 2010-09-23 at 13:04 +0200, Kamil Páral wrote:
This patch kind of reverts fbe9ee91b. We don't want upgradepath to be run for -testing repos, because that would effectively prevent maintainers from pushing into -testing. They would need to wait until that package gets into stable updates in more recent Fedora releases, and we don't want that.
So the solution is not to schedule upgradepath for these update requests at all (at least until we have more complex upgradepath). That will fix the assertion error we had received.
Sorry Kamil, I'm in need of clarification. Isn't 'upgradepath' listed as a mandatory test [1] for any updates entering 'updates-testing'? I feel like we're missing out if we don't run the test when a package is proposed for updates-testing.
Re-reading the criteria [2], do I understand correctly that upgradepath must PASS in order to be pushed into 'stable'? If that's true, I think I better understand the open question now. If the result of upgradepath would only prevent a package from being pushed to stable, why bother running it for 'updates-testing'? Is that correct?
Thanks, James
[1] https://fedoraproject.org/wiki/QA:Package_Update_Acceptance_Test_Plan#Mandat... [2] https://fedoraproject.org/wiki/Package_update_acceptance_criteria
autoqa-devel@lists.fedorahosted.org
-
James Laska -
Kamil Paral