Created
February 3, 2012 16:21
-
-
Save rail/1730935 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/process/release.py b/process/release.py | |
index 04035e6..3dd4b4e 100644 | |
--- a/process/release.py | |
+++ b/process/release.py | |
@@ -1083,9 +1083,11 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig, | |
if not releaseConfig.get('disableBouncerEntries'): | |
trigger_uptake_factory = BuildFactory() | |
+ schedulerNames = [builderPrefix('ready-for-release')] | |
+ if releaseConfig.get('verifyConfigs'): | |
+ schedulerNames.append(builderPrefix('ready-for-rel-test')) | |
trigger_uptake_factory.addStep(Trigger( | |
- schedulerNames=[builderPrefix('ready-for-rel-test'), | |
- builderPrefix('ready-for-release')], | |
+ schedulerNames=schedulerNames, | |
copy_properties=['script_repo_revision', 'release_config'] | |
)) | |
builders.append({ | |
@@ -1505,17 +1507,20 @@ def generateReleaseBranchObjects(releaseConfig, branchConfig, | |
schedulers.append(s) | |
if not releaseConfig.get('disableBouncerEntries'): | |
- mirror_scheduler1 = TriggerBouncerCheck( | |
- name=builderPrefix('ready-for-rel-test'), | |
- configRepo=config_repo, | |
- minUptake=releaseConfig.get('releasetestUptake', 3), | |
- builderNames=[builderPrefix('ready_for_releasetest_testing')] + \ | |
- [builderPrefix('final_verification', platform) | |
- for platform in releaseConfig.get('verifyConfigs', {}).keys()], | |
- username=BuildSlaves.tuxedoUsername, | |
- password=BuildSlaves.tuxedoPassword) | |
- | |
- schedulers.append(mirror_scheduler1) | |
+ if releaseConfig.get('verifyConfigs'): | |
+ mirror_scheduler1 = TriggerBouncerCheck( | |
+ name=builderPrefix('ready-for-rel-test'), | |
+ configRepo=config_repo, | |
+ minUptake=releaseConfig.get('releasetestUptake', 3), | |
+ builderNames=[ | |
+ builderPrefix('ready_for_releasetest_testing')] + \ | |
+ [builderPrefix('final_verification', platform) | |
+ for platform in | |
+ releaseConfig.get('verifyConfigs', {}).keys()], | |
+ username=BuildSlaves.tuxedoUsername, | |
+ password=BuildSlaves.tuxedoPassword) | |
+ | |
+ schedulers.append(mirror_scheduler1) | |
mirror_scheduler2 = TriggerBouncerCheck( | |
name=builderPrefix('ready-for-release'), |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment