[PATCH] upgradepath doesn't support -testing repos yet, disable scheduling

Kamil Páral kparal at redhat.com
Thu Sep 23 11:04:16 UTC 2010


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)
-- 
1.7.2.3



More information about the autoqa-devel mailing list