Permalink
Browse files

CBQE-2334 fix find build to upgrade

Change-Id: Ia4b333bf044bb79cefc8ce531bcdc14d5a792106
Reviewed-on: http://review.couchbase.org/39466
Reviewed-by: Thuan Nguyen <soccon@gmail.com>
Tested-by: Thuan Nguyen <soccon@gmail.com>
  • Loading branch information...
1 parent c1bf150 commit 6b440ed50ec52664517ec49438230c89664b41af @saigon saigon committed Jul 17, 2014
Showing with 8 additions and 4 deletions.
  1. +8 −4 pytests/newupgradebasetest.py
@@ -16,6 +16,7 @@
from scripts.install import InstallerJob
from builds.build_query import BuildQuery
from pprint import pprint
+from testconstants import MV_LATESTBUILD_REPO
class NewUpgradeBaseTest(BaseTestCase):
def setUp(self):
@@ -164,7 +165,9 @@ def operations(self, servers):
def _get_build(self, server, version, remote, is_amazon=False, info=None):
if info is None:
info = remote.extract_remote_info()
- builds, changes = BuildQuery().get_all_builds(version=version, timeout=self.wait_timeout * 5)
+ builds, changes = BuildQuery().get_all_builds(version=version, timeout=self.wait_timeout * 5, \
+ deliverable_type=info.deliverable_type, architecture_type=info.architecture_type, \
+ edition_type="couchbase-server-enterprise", repo=MV_LATESTBUILD_REPO)
self.log.info("finding build %s for machine %s" % (version, server))
if re.match(r'[1-9].[0-9].[0-9]-[0-9]+$', version):
@@ -174,9 +177,10 @@ def _get_build(self, server, version, remote, is_amazon=False, info=None):
find_membase_release_build('%s-enterprise' % (self.product), info.deliverable_type,
info.architecture_type, version.strip(), is_amazon=is_amazon)
else:
- appropriate_build = BuildQuery().\
- find_membase_build(builds, '%s-enterprise' % (self.product), info.deliverable_type,
- info.architecture_type, version.strip(), is_amazon=is_amazon)
+ appropriate_build = BuildQuery().\
+ find_build(builds, '%s-enterprise' % (self.product), info.deliverable_type,
+ info.architecture_type, version.strip())
+
if appropriate_build is None:
self.log.info("builds are: %s \n. Remote is %s, %s. Result is: %s" % (builds, remote.ip, remote.username, version))
raise Exception("Build %s for machine %s is not found" % (version, server))

0 comments on commit 6b440ed

Please sign in to comment.