[MASTER] Goodbye Carrier, hello Phoenix!

Author: ColinFinck

master/master.cfg

@@ -123,12 +123,10 @@ if len(credentials.read("credentials.ini")) == 0:
 ####### WORKERS
 
 c['workers'] = [
-    worker.Worker('AHK-Bot', credentials.get("workers", "AHK-Bot_passwd")),
-    worker.Worker('Fezile', credentials.get("workers", "Fezile_passwd")),
-    worker.Worker('Carrier', credentials.get("workers", "Carrier_passwd")),
-    worker.Worker('Carrier-WHS-Bot', credentials.get("workers", "Carrier-WHS-Bot_passwd")),
-    worker.Worker('Carrier-Win2003-x64', credentials.get("workers", "Carrier-Win2003-x64_passwd")),
-    worker.Worker('Carrier-Win7', credentials.get("workers", "Carrier-Win7_passwd")),
+    worker.Worker('Phoenix', credentials.get("workers", "Phoenix_passwd")),
+    worker.Worker('Phoenix-WHS-Bot', credentials.get("workers", "Phoenix-WHS-Bot_passwd")),
+    worker.Worker('Phoenix-Win2003-x64', credentials.get("workers", "Phoenix-Win2003-x64_passwd")),
+    worker.Worker('Phoenix-Win7', credentials.get("workers", "Phoenix-Win7_passwd")),
     worker.Worker('Testee', credentials.get("workers", "Testee_passwd")),
 ]
 
@@ -348,38 +346,38 @@ c['builders'] = [
     util.BuilderConfig(
         name="Build GCCLin_x86",
         properties={"rosbe": "2.2-Unix", "arch": "i686"},
-        workernames=["Carrier"],
+        workernames=["Phoenix"],
         builddir="Build_GCCLin_x86",
         factory=Build_GCCLin_x86),
     util.BuilderConfig(
         name="Build GCCLin_x86 Release",
         properties={"rosbe": "2.2-Unix", "arch": "i686"},
-        workernames=["Carrier"],
+        workernames=["Phoenix"],
         builddir="Build_GCCLin_x86_Release",
         factory=Build_GCCLin_x86_Release),
     util.BuilderConfig(
         name="Build GCCWin_x86",
         properties={"rosbe": "2.2.0-Win", "arch": "i686"},
-        workernames=["Carrier-Win7"],
+        workernames=["Phoenix-Win7"],
         builddir="Build_GCCWin_x86",
         factory=Build_GCCWin_x86),
     util.BuilderConfig(
         name="Build MSVC_x86",
         properties={"rosbe": "2.2.0-Win", "arch": "i686"},
-        workernames=["Carrier-Win7"],
+        workernames=["Phoenix-Win7"],
         builddir="Build_MSVC_x86",
         factory=Build_MSVC_x86),
     util.BuilderConfig(
         name="Build MSVC_x64",
         properties={"rosbe": "2.2.0-Win", "arch": "amd64"},
-        workernames=["Carrier-Win7"],
+        workernames=["Phoenix-Win7"],
         builddir="Build_MSVC_x64",
         factory=Build_MSVC_x64),
 
-    util.BuilderConfig(name="Test KVM", workernames=["Carrier"], builddir="Test_KVM", factory=Test_KVM),
-    util.BuilderConfig(name="Test KVM_x64", workernames=["Carrier"], builddir="Test_KVM_x64", factory=Test_KVM_x64),
-    util.BuilderConfig(name="Test Win2003_x64", workernames=["Carrier-Win2003-x64"], builddir="Test_Win2003_x64", factory=Test_Win2003_x64),
-    util.BuilderConfig(name="Test WHS", workernames=["Carrier-WHS-Bot"], builddir="Test_WHS", factory=Test_WHS),
+    util.BuilderConfig(name="Test KVM", workernames=["Phoenix"], builddir="Test_KVM", factory=Test_KVM),
+    util.BuilderConfig(name="Test KVM_x64", workernames=["Phoenix"], builddir="Test_KVM_x64", factory=Test_KVM_x64),
+    util.BuilderConfig(name="Test Win2003_x64", workernames=["Phoenix-Win2003-x64"], builddir="Test_Win2003_x64", factory=Test_Win2003_x64),
+    util.BuilderConfig(name="Test WHS", workernames=["Phoenix-WHS-Bot"], builddir="Test_WHS", factory=Test_WHS),
     util.BuilderConfig(name="Test VBox", workernames=["Testee"], builddir="Test_VBox", factory=Test_VBox),
 ]
 
@@ -390,19 +388,6 @@ c['builders'] = [
 # has a variety to choose from, like IRC bots.
 
 c['services'] = [
-    reporters.IRC(
-        host="irc.freenode.net",
-        port=6697,
-        useSSL=True,
-        nick="RosBuild",
-        password=credentials.get("irc", "RosBuild_passwd"),
-        channels=["#reactos", "#reactos-dev"],
-        allowForce=False,
-        notify_events={
-            'exception': 1,
-            'failure': 1
-        }
-    ),
     reporters.GitHubStatusPush(
         token=credentials.get("github", "bbtoken")
     ),