[llvm-commits] [zorg] r125883 - in /zorg/trunk/llvmlab/llvmlab: ci/config.py ui/ci/views.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 18 10:41:51 2011
New Revision: 125883

URL: http://llvm.org/viewvc/llvm-project?rev=125883&view=rev
Log:
llvmlab: Phase config objects should also track the associated builder.

Modified:
    zorg/trunk/llvmlab/llvmlab/ci/config.py
    zorg/trunk/llvmlab/llvmlab/ui/ci/views.py

Modified: zorg/trunk/llvmlab/llvmlab/ci/config.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ci/config.py?rev=125883&r1=125882&r2=125883&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ci/config.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ci/config.py Fri Feb 18 10:41:51 2011
@@ -16,17 +16,20 @@
         if version != 0:
             raise ValueError, "Unknown version"
 
-        return Phase(data['name'], data['number'], data['builder_names'])
+        return Phase(data['name'], data['number'],
+                     data['phase_builder'], data['builder_names'])
 
     def todata(self):
         return { 'version' : 0,
                  'name' : self.name,
                  'number' : self.number,
+                 'phase_builder' : self.phase_builder,
                  'builder_names' : self.builder_names}
 
-    def __init__(self, name, number, builder_names):
+    def __init__(self, name, number, phase_builder, builder_names):
         self.name = name
         self.number = number
+        self.phase_builder = phase_builder
         self.builder_names = builder_names
 
 

Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125883&r1=125882&r2=125883&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:41:51 2011
@@ -17,23 +17,32 @@
 # load a config object per-revision, and try to be smart about caching it unless
 # things change? Can we report results across changing configs?
 phases = [
-    config.Phase("Sanity", 1, ["clang-x86_64-osx10-gcc42-RA"]),
-    config.Phase("Living On", 2, ["clang-x86_64-osx10-DA",
-                                  "clang-x86_64-osx10-RA",
-                                  "nightly_clang-x86_64-osx10-gcc42-RA"]),
-    config.Phase("Tree Health", 3, ["nightly_clang-x86_64-osx10-DA",
-                                    "nightly_clang-x86_64-osx10-RA",
-                                    "nightly_clang-x86_64-osx10-RA-O0",
-                                    "nightly_clang-x86_64-osx10-RA-Os",
-                                    "nightly_clang-x86_64-osx10-RA-O3",
-                                    "nightly_clang-x86_64-osx10-RA-flto",
-                                    "nightly_clang-x86_64-osx10-RA-g"]),
-    config.Phase("Validation", 4, ["clang-x86_64-osx10-RA-stage3",
-                                   "gccTestSuite-clang-x86_64-osx10-RA",
-                                   "nightly_clang-x86_64-osx10-RA-stage3-g",
-                                   "libcxx-clang-x86_64-osx10-RA",
-                                   "boost-trunk-clang-x86_64-osx10-RA"])]
+    config.Phase("Sanity", 1, "phase1 - sanity",
+                 ["clang-x86_64-osx10-gcc42-RA"]),
+    config.Phase("Living On", 2, "phase2 - living",
+                 ["clang-x86_64-osx10-DA",
+                  "clang-x86_64-osx10-RA",
+                  "nightly_clang-x86_64-osx10-gcc42-RA"]),
+    config.Phase("Tree Health", 3, "phase3 - tree health",
+                 ["nightly_clang-x86_64-osx10-DA",
+                  "nightly_clang-x86_64-osx10-RA",
+                  "nightly_clang-x86_64-osx10-RA-O0",
+                  "nightly_clang-x86_64-osx10-RA-Os",
+                  "nightly_clang-x86_64-osx10-RA-O3",
+                  "nightly_clang-x86_64-osx10-RA-flto",
+                  "nightly_clang-x86_64-osx10-RA-g"]),
+    config.Phase("Validation", 4, "phase4 - validation",
+                 ["clang-x86_64-osx10-RA-stage3",
+                  "gccTestSuite-clang-x86_64-osx10-RA",
+                  "nightly_clang-x86_64-osx10-RA-stage3-g",
+                  "libcxx-clang-x86_64-osx10-RA",
+                  "boost-trunk-clang-x86_64-osx10-RA"])]
 builders = [
+    config.Builder("Validated Build"),
+    config.Builder("phase1 - sanity"),
+    config.Builder("phase2 - living"),
+    config.Builder("phase3 - tree health"),
+    config.Builder("phase4 - validation"),
     config.Builder("clang-x86_64-osx10-gcc42-RA"),
     config.Builder("clang-x86_64-osx10-DA"),
     config.Builder("clang-x86_64-osx10-RA"),