Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging from default

changeset:   1650:7234ed80e13d
parent:      1646:d046c7611110
user:        Chris AtLee <catlee@mozilla.com>
date:        Mon Jul 04 14:17:07 2011 -0400
summary:     Bug 668425: fix statusdb importing to not use endtimes to match existing builds. r=nthomas

changeset:   1651:1c6ebbd66161
user:        Chris AtLee <catlee@mozilla.com>
date:        Mon Jul 04 16:31:16 2011 -0400
summary:     Bug 668691: don't restrict valgrind to just idle slaves. r=bhearsum

changeset:   1652:018f7a79d057
tag:         tip
user:        Rail Aliev <rail@mozilla.com>
date:        Tue Jul 05 16:17:03 2011 +0300
summary:     Bug 668657 - Updates builder fails on linux64. r=bhearsum

--HG--
branch : production-0.8
  • Loading branch information...
commit af1b7fd6d7f5ce9aad98c035fd32ef65a2c10e68 2 parents c4ae5b9 + 9b242b0
@ccooper ccooper authored
Showing with 3 additions and 6 deletions.
  1. +1 −4 bin/update_from_files.py
  2. +1 −1  misc.py
  3. +1 −1  process/release.py
View
5 bin/update_from_files.py
@@ -203,17 +203,14 @@ def updateFromFiles(session, master_url, master_name, builders, last_time, updat
if not build:
continue
starttime = None
- endtime = None
if build.started:
starttime = datetime.utcfromtimestamp(build.started)
- if build.finished:
- endtime = datetime.utcfromtimestamp(build.finished)
q = session.query(model.Build).filter_by(
+ master_id=master.id,
builder=db_builder,
buildnumber=build.number,
starttime=starttime,
- endtime=endtime,
)
db_build = q.first()
if not db_build:
View
2  misc.py
@@ -2956,7 +2956,7 @@ def generateValgrindObjects(config, slaves):
builder = {'name': 'valgrind-%s' % platform,
'builddir': 'valgrind-%s' % platform,
'slavenames': slaves[platform],
- 'nextSlave': _nextSlowIdleSlave(config['idle_slaves']),
+ 'nextSlave': _nextSlowSlave,
'factory': f,
'category': 'idle',
'env': env,
View
2  process/release.py
@@ -979,7 +979,7 @@ def majorUpdateVerifyBuilders(platform):
builders.append({
'name': builderPrefix('updates'),
- 'slavenames': branchConfig['platforms']['linux']['slaves'] + branchConfig['platforms']['linux64']['slaves'],
+ 'slavenames': branchConfig['platforms']['linux']['slaves'],
'category': builderPrefix(''),
'builddir': builderPrefix('updates'),
'slavebuilddir': reallyShort(builderPrefix('updates')),
Please sign in to comment.
Something went wrong with that request. Please try again.