Mercurial > octave-buildbot
changeset 52:00b45a7930ab
redistribute builds on jwe systems and reorder lists
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 15 Jun 2023 08:34:29 -0400 |
| parents | 943ccaed4bb4 |
| children | 08a1c9cd3d2b |
| files | master.cfg |
| diffstat | 1 files changed, 91 insertions(+), 89 deletions(-) [+] |
line wrap: on
line diff
--- a/master.cfg Sat Feb 18 11:19:23 2023 -0500 +++ b/master.cfg Thu Jun 15 08:34:29 2023 -0400 @@ -116,18 +116,14 @@ from buildbot.schedulers.forcesched import ForceScheduler from buildbot.schedulers import timed -## Builds below that are tagged with jwe-debian-x86_64-1 and -## jwe-debian-x86_64-5 are currently running on jwe-debian-x86_64-4 -## instead. - all_default_octave_builders = []; all_default_octave_builders.append ("gcc-debian") # jwe-debian-x86_64-5 all_default_octave_builders.append ("gcc-lto-debian") # jwe-debian-x86_64-5 +all_default_octave_builders.append ("clang-debian") # jwe-debian-x86_64-5 all_default_octave_builders.append ("gcc-fedora") # das all_default_octave_builders.append ("gcc-lto-fedora") # das +all_default_octave_builders.append ("clang-fedora") # das all_default_octave_builders.append ("no-extras-debian") # jwe-debian-x86_64-5 -all_default_octave_builders.append ("clang-debian") # jwe-debian-x86_64-1 -all_default_octave_builders.append ("clang-fedora") # das #all_default_octave_builders.append ("gcc-6-debian") # mtmx #all_default_octave_builders.append ("clang-3.9-debian") # mtmx #all_default_octave_builders.append ("clang-osx") # simone @@ -135,22 +131,25 @@ all_stable_octave_builders = []; all_stable_octave_builders.append ("stable-gcc-debian") # jwe-debian-x86_64-4 all_stable_octave_builders.append ("stable-gcc-lto-debian") # jwe-debian-x86_64-4 +all_stable_octave_builders.append ("stable-clang-debian") # jwe-debian-x86_64-4 all_stable_octave_builders.append ("stable-gcc-fedora") # das +all_stable_octave_builders.append ("stable-clang-fedora") # das all_stable_octave_builders.append ("stable-no-extras-debian") # jwe-debian-x86_64-4 -all_stable_octave_builders.append ("stable-clang-debian") # jwe-debian-x86_64-1 -all_stable_octave_builders.append ("stable-clang-fedora") # das #all_stable_octave_builders.append ("stable-clang-osx") # simone all_mxe_octave_builders = []; -all_mxe_octave_builders.append ("w32-on-debian") # jwe-debian-x86_64-5 +all_mxe_octave_builders.append ("w32-on-debian") # jwe-debian-x86_64-4 +all_mxe_octave_builders.append ("w32-release-on-debian") # jwe-debian-x86_64-4 +all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe-debian-x86_64-4 + all_mxe_octave_builders.append ("w64-32-on-debian") # jwe-debian-x86_64-5 -all_mxe_octave_builders.append ("w64-64-on-debian") # jwe-debian-x86_64-4 -all_mxe_octave_builders.append ("w32-release-on-debian") # jwe-debian-x86_64-5 all_mxe_octave_builders.append ("w64-32-release-on-debian") # jwe-debian-x86_64-5 -all_mxe_octave_builders.append ("w64-64-release-on-debian") # jwe-debian-x86_64-4 -all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe-debian-x86_64-5 all_mxe_octave_builders.append ("w64-32-stable-on-debian") # jwe-debian-x86_64-5 -all_mxe_octave_builders.append ("w64-64-stable-on-debian") # jwe-debian-x86_64-4 + +all_mxe_octave_builders.append ("w64-64-on-debian") # jwe-debian-x86_64-5 +all_mxe_octave_builders.append ("w64-64-release-on-debian") # jwe-debian-x86_64-5 +all_mxe_octave_builders.append ("w64-64-stable-on-debian") # jwe-debian-x86_64-5 + all_mxe_octave_builders.append ("mxe-native-on-debian") # jwe-debian-x86_64-5 all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe-debian-x86_64-5 @@ -562,71 +561,70 @@ c["builders"] = [] -#c["builders"].append (BuilderConfig (name = "gcc-6-debian", -# workernames = ["mtmx-debian-x86_64"], -# factory = mk_gcc_6_factory (10, "-j2", "default"))) - c["builders"].append (BuilderConfig (name = "gcc-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 + workernames = ["jwe-debian-x86_64-5"], factory = mk_gcc_factory (19, "-j16", "default"))) -c["builders"].append (BuilderConfig (name = "stable-gcc-debian", - workernames = ["jwe-debian-x86_64-4"], - factory = mk_gcc_factory (19, "-j16", "stable"))) - c["builders"].append (BuilderConfig (name = "gcc-lto-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 + workernames = ["jwe-debian-x86_64-5"], factory = mk_gcc_lto_factory (19, "-j16", "default"))) -c["builders"].append (BuilderConfig (name = "stable-gcc-lto-debian", - workernames = ["jwe-debian-x86_64-4"], - factory = mk_gcc_lto_factory (19, "-j16", "stable"))) +c["builders"].append (BuilderConfig (name = "clang-debian", + workernames = ["jwe-debian-x86_64-5"], + factory = mk_clang_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "gcc-fedora", workernames = ["das_fc25-x86_64"], factory = mk_gcc_factory (0, "-j4", "default"))) -c["builders"].append (BuilderConfig (name = "stable-gcc-fedora", - workernames = ["das_fc25-x86_64"], - factory = mk_gcc_factory (0, "-j4", "stable"))) - c["builders"].append (BuilderConfig (name = "gcc-lto-fedora", workernames = ["das_fc25-x86_64"], factory = mk_gcc_lto_factory (10, "-j4", "default"))) +c["builders"].append (BuilderConfig (name = "clang-fedora", + workernames = ["das_fc25-x86_64"], + factory = mk_clang_factory (19, "-j4", "default"))) + c["builders"].append (BuilderConfig (name = "no-extras-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 + workernames = ["jwe-debian-x86_64-5"], factory = mk_no_extras_factory (19, "-j16", "default"))) -c["builders"].append (BuilderConfig (name = "stable-no-extras-debian", - workernames = ["jwe-debian-x86_64-4"], - factory = mk_no_extras_factory (19, "-j16", "stable"))) +#c["builders"].append (BuilderConfig (name = "gcc-6-debian", +# workernames = ["mtmx-debian-x86_64"], +# factory = mk_gcc_6_factory (10, "-j2", "default"))) + +#c["builders"].append (BuilderConfig (name = "clang-osx", +# workernames = ["epfl-elcapitan-x86_64"], +# factory = mk_clang_osx_factory (0, "-j4", "default"))) #c["builders"].append (BuilderConfig (name = "clang-3.9-debian", # workernames = ["mtmx-debian-x86_64"], # factory = mk_clang_3_9_factory (19, "-j2", "default"))) -c["builders"].append (BuilderConfig (name = "clang-debian", + +c["builders"].append (BuilderConfig (name = "stable-gcc-debian", workernames = ["jwe-debian-x86_64-4"], - factory = mk_clang_factory (19, "-j8", "default"))) + factory = mk_gcc_factory (19, "-j16", "stable"))) + +c["builders"].append (BuilderConfig (name = "stable-gcc-lto-debian", + workernames = ["jwe-debian-x86_64-4"], + factory = mk_gcc_lto_factory (19, "-j16", "stable"))) c["builders"].append (BuilderConfig (name = "stable-clang-debian", - workernames = ["jwe-debian-x86_64-4"], + workernames = ["jwe-debian-x86_64-5"], factory = mk_clang_factory (19, "-j8", "stable"))) -c["builders"].append (BuilderConfig (name = "clang-fedora", +c["builders"].append (BuilderConfig (name = "stable-gcc-fedora", workernames = ["das_fc25-x86_64"], - factory = mk_clang_factory (19, "-j4", "default"))) - + factory = mk_gcc_factory (0, "-j4", "stable"))) c["builders"].append (BuilderConfig (name = "stable-clang-fedora", workernames = ["das_fc25-x86_64"], factory = mk_clang_factory (19, "-j4", "stable"))) - -#c["builders"].append (BuilderConfig (name = "clang-osx", -# workernames = ["epfl-elcapitan-x86_64"], -# factory = mk_clang_osx_factory (0, "-j4", "default"))) +c["builders"].append (BuilderConfig (name = "stable-no-extras-debian", + workernames = ["jwe-debian-x86_64-4"], + factory = mk_no_extras_factory (19, "-j16", "stable"))) #c["builders"].append (BuilderConfig (name = "stable-clang-osx", # workernames = ["epfl-elcapitan-x86_64"], @@ -809,9 +807,30 @@ ["nsis-installer", "7z-dist"]) c["builders"].append (BuilderConfig (name = "w32-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 + workernames = ["jwe-debian-x86_64-4"], + factory = w32_factory)) + +w32_factory = mk_w32_factory (19, [1, 16], [8, 2], + "release", "release", + ["--disable-system-octave"], + "release-octave", + ["nsis-installer", "7z-dist"]) + +c["builders"].append (BuilderConfig (name = "w32-release-on-debian", + workernames = ["jwe-debian-x86_64-4"], factory = w32_factory)) +w32_factory = mk_w32_factory (19, [1, 16], [8, 2], + "stable", "release", + ["--enable-system-octave"], + "stable-octave", + ["nsis-installer", "7z-dist"]) + +c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", + workernames = ["jwe-debian-x86_64-4"], + factory = w32_factory)) + + w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], "default", "default", ["--enable-system-octave"], @@ -819,9 +838,30 @@ ["nsis-installer", "7z-dist"]) c["builders"].append (BuilderConfig (name = "w64-32-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 + workernames = ["jwe-debian-x86_64-5"], + factory = w64_32_factory)) + +w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], + "release", "release", + ["--disable-system-octave"], + "release-octave", + ["nsis-installer", "7z-dist"]) + +c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", + workernames = ["jwe-debian-x86_64-5"], factory = w64_32_factory)) +w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], + "stable", "release", + ["--enable-system-octave"], + "stable-octave", + ["nsis-installer", "7z-dist"]) + +c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", + workernames = ["jwe-debian-x86_64-5"], + factory = w64_32_factory)) + + w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2], "default", "default", ["--enable-system-octave"], @@ -832,26 +872,6 @@ workernames = ["jwe-debian-x86_64-4"], factory = w64_64_factory)) -w32_factory = mk_w32_factory (19, [1, 16], [8, 2], - "release", "release", - ["--disable-system-octave"], - "release-octave", - ["nsis-installer", "7z-dist"]) - -c["builders"].append (BuilderConfig (name = "w32-release-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 - factory = w32_factory)) - -w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], - "release", "release", - ["--disable-system-octave"], - "release-octave", - ["nsis-installer", "7z-dist"]) - -c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 - factory = w64_32_factory)) - w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2], "release", "release", ["--disable-system-octave"], @@ -862,26 +882,6 @@ workernames = ["jwe-debian-x86_64-4"], factory = w64_64_factory)) -w32_factory = mk_w32_factory (19, [1, 16], [8, 2], - "stable", "release", - ["--enable-system-octave"], - "stable-octave", - ["nsis-installer", "7z-dist"]) - -c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 - factory = w32_factory)) - -w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], - "stable", "release", - ["--enable-system-octave"], - "stable-octave", - ["nsis-installer", "7z-dist"]) - -c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 - factory = w64_32_factory)) - w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2], "stable", "release", ["--enable-system-octave"], @@ -892,22 +892,24 @@ workernames = ["jwe-debian-x86_64-4"], factory = w64_64_factory)) + native_factory = mk_native_factory (19, [1, 16], [8, 2], "default", "default", "default-octave", "tar-dist") c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 + workernames = ["jwe-debian-x86_64-5"], factory = native_factory)) + native_all_factory = mk_native_all_factory (19, [1, 16], [8, 2], "default", "default", "default-octave", "tar-dist") c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be on -5 + workernames = ["jwe-debian-x86_64-5"], factory = native_all_factory))