Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

changeset: 1687:d70d671e7288

parent:      1685:e537b3b7d1a1
user:        Rail Aliev <rail@mozilla.com>
date:        Wed Jul 20 12:03:44 2011 +0300
summary:     Bug 670660 - major update verify builders are broken. r=bhearsum

changeset:   1688:e4ca4693a43e
user:        Rail Aliev <rail@mozilla.com>
date:        Wed Jul 20 16:24:44 2011 +0300
summary:     Bug 548330 - stop running pskill and delete it from the slaves. r=bhearsum

changeset:   1690:b6cf6d4e3e4d
tag:         tip
parent:      1688:e4ca4693a43e
user:        Mike Taylor <bear@mozilla.com>
date:        Wed Jul 20 17:53:34 2011 -0400
summary:     bug 657723 r=aki changing abi search name for android to prepare for ndk5

--HG--
branch : production-0.8
  • Loading branch information...
commit f991af57b58d0e094e71c6f9d648c1bc5a0e2524 2 parents c5b30ed + 36da128
@armenzg armenzg authored
Showing with 10 additions and 29 deletions.
  1. +3 −24 process/factory.py
  2. +7 −5 process/release.py
View
27 process/factory.py
@@ -529,16 +529,16 @@ def getPackageFilename(self, platform, platform_variation):
else:
return False
return packageFilename
-
+
def parseFileSize(self, propertyName):
def getSize(rv, stdout, stderr):
- stdout = stdout.strip()
+ stdout = stdout.strip()
return {propertyName: stdout.split()[4]}
return getSize
def parseFileHash(self, propertyName):
def getHash(rv, stdout, stderr):
- stdout = stdout.strip()
+ stdout = stdout.strip()
return {propertyName: stdout.split(' ',2)[1]}
return getHash
@@ -5244,27 +5244,6 @@ def __init__(self, platform, productName, config_repo_path, config_dir,
self.env.update(env)
if self.platform == 'win32':
- self.addStep(TinderboxShellCommand,
- name='kill_sh',
- description='kill sh',
- descriptionDone="killed sh",
- command="pskill -t sh.exe",
- workdir="D:\\Utilities"
- )
- self.addStep(TinderboxShellCommand,
- name='kill_make',
- description='kill make',
- descriptionDone="killed make",
- command="pskill -t make.exe",
- workdir="D:\\Utilities"
- )
- self.addStep(TinderboxShellCommand,
- name='kill_firefox',
- description='kill firefox',
- descriptionDone="killed firefox",
- command="pskill -t firefox.exe",
- workdir="D:\\Utilities"
- )
self.addStep(SetProperty,
command=['bash', '-c', 'pwd -W'],
property='toolsdir',
View
12 process/release.py
@@ -40,7 +40,7 @@
from buildbotcustom.status.log_handlers import SubprocessLogHandler
from buildbotcustom.status.errors import update_verify_error
from build.paths import getRealpath
-from release.info import getRuntimeTag
+from release.info import getRuntimeTag, getReleaseTag
import BuildSlaves
DEFAULT_PARALLELIZATION = 10
@@ -50,7 +50,7 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig,
# This variable is one thing that forces us into reconfiging prior to a
# release. It should be removed as soon as nothing depends on it.
sourceRepoInfo = releaseConfig['sourceRepositories'][sourceRepoKey]
- releaseTag = '%s_RELEASE' % releaseConfig['baseTag']
+ releaseTag = getReleaseTag(releaseConfig['baseTag'])
# This tag is created post-signing, when we do some additional
# config file bumps
runtimeTag = getRuntimeTag(releaseTag)
@@ -311,7 +311,7 @@ def majorUpdateVerifyBuilders(platform):
releaseConfig['buildNumber'],
protocol='http',
server=releaseConfig['ftpServer'])
- signed_apk_url = '%s%s/%s/%s-%s.%s.eabi-arm.apk' % \
+ signed_apk_url = '%s%s/%s/%s-%s.%s.android-arm.apk' % \
(candidatesDir,
branchConfig['platforms']['linux-android']['stage_platform'],
locale, releaseConfig['productName'], releaseConfig['version'],
@@ -323,7 +323,7 @@ def majorUpdateVerifyBuilders(platform):
))
if branchConfig['platforms']['linux-android'].get('multi_locale'):
locale = 'multi'
- signed_apk_url = '%s%s/%s/%s-%s.%s.eabi-arm.apk' % \
+ signed_apk_url = '%s%s/%s/%s-%s.%s.android-arm.apk' % \
(candidatesDir,
branchConfig['platforms']['linux-android'].get(
'stage_platform'),
@@ -1343,6 +1343,8 @@ def majorUpdateVerifyBuilders(platform):
'_' + str(n)
env = builder_env.copy()
env.update(branchConfig['platforms'][platform]['env'])
+ mu_runtimeTag = getRuntimeTag(getReleaseTag(
+ releaseConfig['majorUpdateBaseTag']))
builders.append({
'name': builderName,
@@ -1355,7 +1357,7 @@ def majorUpdateVerifyBuilders(platform):
'env': env,
'properties': {'builddir': builddir,
'slavebuilddir': reallyShort(builddir),
- 'script_repo_revision': runtimeTag,
+ 'script_repo_revision': mu_runtimeTag,
'release_tag': releaseTag,
'release_config': releaseConfigFile},
})
Please sign in to comment.
Something went wrong with that request. Please try again.