Only run endurance tests on nodes with the 'endurance' label. Fixes i…

…ssue #173
mozilla · Feb 5, 2013 · e3f81ee · e3f81ee
1 parent 8a19159
commit e3f81ee
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 40 deletions.
diff --git a/config/production/jenkins.patch b/config/production/jenkins.patch
@@ -16,7 +16,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.6 64bit</label>
++      <label>mac 10.6 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -96,7 +96,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.7 64bit</label>
++      <label>mac 10.7 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -176,7 +176,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.8 64bit</label>
++      <label>mac 10.8 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -236,7 +236,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>linux ubuntu 32bit</label>
++      <label>linux ubuntu 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -296,7 +296,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>linux ubuntu 64bit</label>
++      <label>linux ubuntu 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -356,7 +356,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 2000 32bit</label>
++      <label>windows 2000 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -416,7 +416,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows xp 32bit</label>
++      <label>windows xp 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -476,7 +476,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows vista 32bit</label>
++      <label>windows vista 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -536,7 +536,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 7 32bit</label>
++      <label>windows 7 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -596,7 +596,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 7 64bit</label>
++      <label>windows 7 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -656,7 +656,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 8 32bit</label>
++      <label>windows 8 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -716,7 +716,7 @@ index 755990a..5e24aa9 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 8 64bit</label>
++      <label>windows 8 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">

diff --git a/config/production_new/jenkins.patch b/config/production_new/jenkins.patch
@@ -16,7 +16,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.6 64bit</label>
++      <label>mac 10.6 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -96,7 +96,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.7 64bit</label>
++      <label>mac 10.7 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -176,7 +176,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.8 64bit</label>
++      <label>mac 10.8 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -236,7 +236,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>linux ubuntu 12.04 32bit</label>
++      <label>linux ubuntu 12.04 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -296,7 +296,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>linux ubuntu 12.04 64bit</label>
++      <label>linux ubuntu 12.04 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -356,7 +356,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>linux ubuntu 12.10 32bit</label>
++      <label>linux ubuntu 12.10 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -416,7 +416,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>linux ubuntu 12.10 64bit</label>
++      <label>linux ubuntu 12.10 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -476,7 +476,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 2000 32bit</label>
++      <label>windows 2000 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -516,7 +516,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows xp 32bit</label>
++      <label>windows xp 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -576,7 +576,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows vista 32bit</label>
++      <label>windows vista 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -636,7 +636,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 7 32bit</label>
++      <label>windows 7 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -696,7 +696,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 7 64bit</label>
++      <label>windows 7 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -756,7 +756,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 8 32bit</label>
++      <label>windows 8 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -816,7 +816,7 @@ index 02d5f00..61b1332 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 8 64bit</label>
++      <label>windows 8 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">

diff --git a/config/staging/jenkins.patch b/config/staging/jenkins.patch
@@ -16,7 +16,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.5 32bit</label>
++      <label>mac 10.5 32bit endurance</label>
 +      <nodeProperties/>
 +    </slave>
 +    <slave>
@@ -27,7 +27,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.6 64bit</label>
++      <label>mac 10.6 64bit endurance</label>
 +      <nodeProperties/>
 +    </slave>
 +    <slave>
@@ -38,7 +38,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.7 64bit</label>
++      <label>mac 10.7 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -58,7 +58,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>mac 10.8 64bit</label>
++      <label>mac 10.8 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -78,7 +78,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>linux ubuntu 32bit</label>
++      <label>linux ubuntu 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -98,7 +98,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>linux ubuntu 64bit</label>
++      <label>linux ubuntu 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -118,7 +118,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 2000 32bit</label>
++      <label>windows 2000 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -138,7 +138,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows xp 32bit</label>
++      <label>windows xp 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -158,7 +158,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows vista 32bit</label>
++      <label>windows vista 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -178,7 +178,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 7 32bit</label>
++      <label>windows 7 32bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -198,7 +198,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 7 64bit</label>
++      <label>windows 7 64bit endurance</label>
 +      <nodeProperties>
 +        <ruby-proxy-object>
 +          <ruby-object ruby-class="Jenkins::Slaves::NodePropertyProxy" pluginid="nodeofflinenotification">
@@ -218,7 +218,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 8 32bit</label>
++      <label>windows 8 32bit endurance</label>
 +      <nodeProperties/>
 +    </slave>
 +    <slave>
@@ -229,7 +229,7 @@ index 755990a..87f4ace 100644
 +      <mode>NORMAL</mode>
 +      <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
 +      <launcher class="hudson.slaves.JNLPLauncher"/>
-+      <label>windows 8 64bit</label>
++      <label>windows 8 64bit endurance</label>
 +      <nodeProperties/>
 +    </slave>
 +  </slaves>

diff --git a/jenkins-master/jobs/trigger-ondemand/workspace/trigger.py b/jenkins-master/jobs/trigger-ondemand/workspace/trigger.py
@@ -46,7 +46,7 @@ def main():
         if not config.has_option(section, 'platform'):
             continue
         platform = config.get(section, 'platform')
-        node_labels = section.split(' ')
+        node_labels = section.split()
 
         # Iterate through all builds per platform
         for entry in config.options(section):
@@ -64,7 +64,11 @@ def main():
             except:
                 continue
 
+            if script in ['endurance']:
+                node_labels.append(script)
+
             for locale in locales:
+
                 parameters = {
                     'BUILD_TYPE': build_type,
                     'VERSION': version,

diff --git a/pulse.py b/pulse.py
@@ -133,6 +133,8 @@ def generate_job_parameters(self, testrun, node, platform, build_properties):
 
         # Add node and mozmill environment information
         parameters['NODES'] = node
+        if testrun in ['endurance']:
+            parameters['NODES'] = ' && '.join([parameters['NODES'], testrun])
         parameters['ENV_PLATFORM'] = self.get_mozmill_environment_platform(platform)
 
         return parameters