Update all builders to RosBE 2.2 and remove the GCC8 builder.

Author: ColinFinck

master/master.cfg

@@ -126,7 +126,6 @@ c['workers'] = [
     worker.Worker('AHK-Bot', credentials.get("workers", "AHK-Bot_passwd")),
     worker.Worker('Fezile', credentials.get("workers", "Fezile_passwd")),
     worker.Worker('HotelLux', credentials.get("workers", "HotelLux_passwd")),
-    worker.Worker('Carrier-GCC8', credentials.get("workers", "Carrier-GCC8_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")),
@@ -155,7 +154,7 @@ c['schedulers'].append(schedulers.SingleBranchScheduler(
     name="all",
     change_filter=util.ChangeFilter(branch='master'),
     treeStableTimer=None,
-    builderNames=["Build GCCLin_x86", "Build GCCLin_8_x86", "Build MSVC_x86", "Build MSVC_x64"]))
+    builderNames=["Build GCCLin_x86", "Build MSVC_x86", "Build MSVC_x64"]))
     #builderNames=["Build GCCLin_x86", "Build MSVC_x86", "Build MSVC_x64", "Test KVM AHK"]))
 
 c['schedulers'].append(schedulers.SingleBranchScheduler(
@@ -189,7 +188,7 @@ c['schedulers'].append(schedulers.ForceScheduler(
     properties=[util.NestedParameter("", fields=[
         util.StringParameter(name="id", label="JIRA Patch ID:")
     ])],
-    builderNames=["Build GCCLin_x86", "Build GCCLin_8_x86", "Build GCCWin_x86", "Build MSVC_x86", "Build MSVC_x64", "Test WHS"]))
+    builderNames=["Build GCCLin_x86", "Build GCCWin_x86", "Build MSVC_x86", "Build MSVC_x64", "Test WHS"]))
     #builderNames=["Build GCCLin_x86", "Build GCCWin_x86", "Build MSVC_x86", "Build MSVC_x64", "Test KVM AHK", "Test WHS"]))
 
 ####### BUILDERS
@@ -250,18 +249,6 @@ Build_GCCLin_x86.addStep(steps.SetPropertyFromCommand(command=["bash", scripts_r
 Build_GCCLin_x86.addStep(steps.Trigger(schedulerNames=['HotelLux Testbot Trigger'], waitForFinish=False, copy_properties=['got_revision', 'id', 'owners', 'reason', 'suffix']))
 Build_GCCLin_x86.addStep(bs_upload_iso)
 
-Build_GCCLin_8_x86 = util.BuildFactory();
-Build_GCCLin_8_x86.addStep(bs_clean)
-Build_GCCLin_8_x86.addStep(bs_git)
-Build_GCCLin_8_x86.addStep(bs_prepare_source)
-Build_GCCLin_8_x86.addStep(make_bs_configure())
-Build_GCCLin_8_x86.addStep(bs_bootcd)
-Build_GCCLin_8_x86.addStep(bs_livecd)
-Build_GCCLin_8_x86.addStep(steps.Compile(name="regtestcd", command=["bash", scripts_root + "regtestcd", "-DENABLE_ROSTESTS=1"], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["TestCD"], descriptionDone=["TestCD"]))
-Build_GCCLin_8_x86.addStep(steps.SetPropertyFromCommand(command=["bash", scripts_root + "get_suffix"], property="suffix"))
-Build_GCCLin_8_x86.addStep(steps.Trigger(schedulerNames=['HotelLux Testbot Trigger'], waitForFinish=False, copy_properties=['got_revision', 'id', 'owners', 'reason', 'suffix']))
-Build_GCCLin_8_x86.addStep(bs_upload_iso)
-
 Build_GCCLin_x86_Release = util.BuildFactory();
 Build_GCCLin_x86_Release.addStep(bs_clean)
 Build_GCCLin_x86_Release.addStep(bs_git)
@@ -350,19 +337,13 @@ Test_WHS.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run
 c['builders'] = [
     util.BuilderConfig(
         name="Build GCCLin_x86",
-        properties={"rosbe": "2.1.2-Unix", "arch": "i686"},
+        properties={"rosbe": "2.2-Unix", "arch": "i686"},
         workernames=["HotelLux"],
         builddir="Build_GCCLin_x86",
         factory=Build_GCCLin_x86),
-    util.BuilderConfig(
-        name="Build GCCLin_8_x86",
-        properties={"rosbe": "2.2.0-Unix", "arch": "i686"},
-        workernames=["Carrier-GCC8"],
-        builddir="Build_GCCLin_8_x86",
-        factory=Build_GCCLin_8_x86),
     util.BuilderConfig(
         name="Build GCCLin_x86 Release",
-        properties={"rosbe": "2.1.2-Unix", "arch": "i686"},
+        properties={"rosbe": "2.2-Unix", "arch": "i686"},
         workernames=["HotelLux"],
         builddir="Build_GCCLin_x86_Release",
         factory=Build_GCCLin_x86_Release),