Bug 633953 - separate pre push checks and pre-release virus scan. r=b…

…hearsum

process/release.py

@@ -31,7 +31,8 @@
 
 DEFAULT_L10N_CHUNKS = 15
 
-def generateReleaseBranchObjects(releaseConfig, branchConfig, staging):
+def generateReleaseBranchObjects(releaseConfig, branchConfig, staging,
+                                 releaseConfigFile):
     # 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.
     releaseTag = '%s_RELEASE' % releaseConfig['baseTag']
@@ -356,6 +357,20 @@ def l10nBuilders(platform):
     )
     schedulers.append(update_verify_scheduler)
 
+    check_permissions_scheduler = Dependent(
+        name=builderPrefix('check_permissions'),
+        upstream=updates_scheduler,
+        builderNames=[builderPrefix('check_permissions')]
+    )
+    schedulers.append(check_permissions_scheduler)
+
+    antivirus_scheduler = Dependent(
+        name=builderPrefix('antivirus'),
+        upstream=updates_scheduler,
+        builderNames=[builderPrefix('antivirus')]
+    )
+    schedulers.append(antivirus_scheduler)
+
     if releaseConfig['majorUpdateRepoPath']:
         majorUpdateBuilderNames = []
         for platform in sorted(releaseConfig['majorUpdateVerifyConfigs'].keys()):
@@ -927,24 +942,46 @@ def l10nBuilders(platform):
                 reallyShort(builderPrefix('%s_up_vrfy' % platform))}
         })
 
-    pre_push_checks_factory = ScriptFactory(
+    check_permissions_factory = ScriptFactory(
         scriptRepo=tools_repo,
-        extra_args=[branchConfigFile, 'check'],
+        extra_args=[branchConfigFile, 'permissions'],
         script_timeout=3*60*60,
         scriptName='scripts/release/push-to-mirrors.sh',
     )
 
     builders.append({
-        'name': builderPrefix('pre_push_checks'),
+        'name': builderPrefix('check_permissions'),
         'slavenames': branchConfig['platforms']['linux']['slaves'],
         'category': builderPrefix(''),
-        'builddir': builderPrefix('pre_push_checks'),
-        'slavebuilddir': reallyShort(builderPrefix('psh_chks')),
-        'factory': pre_push_checks_factory,
+        'builddir': builderPrefix('check_permissions'),
+        'slavebuilddir': reallyShort(builderPrefix('chk_prms')),
+        'factory': check_permissions_factory,
         'nextSlave': _nextFastReservedSlave,
         'env': builder_env,
-        'properties': {'slavebuilddir':
-                        reallyShort(builderPrefix('psh_chks'))},
+        'properties': {'slavebuilddir': reallyShort(builderPrefix('chk_prms')),
+                       'script_repo_revision': releaseTag,
+                       'release_config': releaseConfigFile},
+    })
+
+    antivirus_factory = ScriptFactory(
+        scriptRepo=tools_repo,
+        extra_args=[branchConfigFile, 'antivirus'],
+        script_timeout=3*60*60,
+        scriptName='scripts/release/push-to-mirrors.sh',
+    )
+
+    builders.append({
+        'name': builderPrefix('antivirus'),
+        'slavenames': branchConfig['platforms']['linux']['slaves'],
+        'category': builderPrefix(''),
+        'builddir': builderPrefix('antivirus'),
+        'slavebuilddir': reallyShort(builderPrefix('av')),
+        'factory': antivirus_factory,
+        'nextSlave': _nextFastReservedSlave,
+        'env': builder_env,
+        'properties': {'slavebuilddir': reallyShort(builderPrefix('av')),
+                       'script_repo_revision': releaseTag,
+                       'release_config': releaseConfigFile},
     })
 
     push_to_mirrors_factory = ScriptFactory(
@@ -957,7 +994,7 @@ def l10nBuilders(platform):
     push_to_mirrors_factory.addStep(Trigger(
         schedulerNames=[builderPrefix('ready-for-rel-test'),
                         builderPrefix('ready-for-release')],
-        copy_properties=['revision', 'release_config']
+        copy_properties=['script_repo_revision', 'release_config']
     ))
 
 

scheduler.py

@@ -233,7 +233,7 @@ class TriggerBouncerCheck(Triggerable):
     working = False
     loop = None
     release_config = None
-    revision = None
+    script_repo_revision = None
     configRepo = None
 
     def __init__(self, minUptake, configRepo, checkMARs=True,
@@ -260,8 +260,8 @@ def trigger(self, ss, set_props=None):
         if set_props:
             props.updateFromProperties(set_props)
 
-        self.revision = props.getProperty('revision')
-        assert self.revision, 'revision should be set'
+        self.script_repo_revision = props.getProperty('script_repo_revision')
+        assert self.script_repo_revision, 'script_repo_revision should be set'
         self.release_config = props.getProperty('release_config')
         assert self.release_config, 'release_config should be set'
 
@@ -286,7 +286,7 @@ def stopLoop(self, reason=None):
 
     def getReleaseConfig(self):
         url = str('%s/raw-file/%s/%s' %
-                  (self.configRepo, self.revision, self.release_config))
+                  (self.configRepo, self.script_repo_revision, self.release_config))
         d = getPage(url)
 
         def setReleaseConfig(res):