# HG changeset patch # User John W. Eaton # Date 1694438493 14400 # Node ID a66ed5a63f02c66c1f6b1b7ecafad5280e93d21c # Parent 92ec1f0534e3da0e12aba2810d2f4d85a3e25951 redistribute builds on jwe systems and reorder lists diff -r 92ec1f0534e3 -r a66ed5a63f02 master.cfg --- a/master.cfg Sat Aug 12 10:20:14 2023 -0400 +++ b/master.cfg Mon Sep 11 09:21:33 2023 -0400 @@ -116,28 +116,25 @@ from buildbot.schedulers.forcesched import ForceScheduler from buildbot.schedulers import timed -## Builds below that are tagged with 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-4, should be -5 -all_default_octave_builders.append ("gcc-lto-debian") ## jwe-debian-x86_64-4, should be -5 -all_default_octave_builders.append ("clang-debian") ## jwe-debian-x86_64-4, should be -5 +all_default_octave_builders.append ("gcc-debian") ## jwe-debian-x86_64-4 +all_default_octave_builders.append ("gcc-lto-debian") ## jwe-debian-x86_64-4 +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-4, should be -5 +all_default_octave_builders.append ("no-extras-debian") ## jwe-debian-x86_64-4 #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 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-debian") # jwe-debian-x86_64-5 +all_stable_octave_builders.append ("stable-gcc-lto-debian") # jwe-debian-x86_64-5 +all_stable_octave_builders.append ("stable-clang-debian") # jwe-debian-x86_64-5 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-no-extras-debian") # jwe-debian-x86_64-5 #all_stable_octave_builders.append ("stable-clang-osx") # simone all_mxe_octave_builders = []; @@ -145,16 +142,16 @@ 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-4, should be -5 -all_mxe_octave_builders.append ("w64-32-release-on-debian") ## jwe-debian-x86_64-4, should be -5 -all_mxe_octave_builders.append ("w64-32-stable-on-debian") ## jwe-debian-x86_64-4, should be -5 +all_mxe_octave_builders.append ("w64-32-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-32-stable-on-debian") ## jwe-debian-x86_64-5 -all_mxe_octave_builders.append ("w64-64-on-debian") ## jwe-debian-x86_64-4, should be -5 -all_mxe_octave_builders.append ("w64-64-release-on-debian") ## jwe-debian-x86_64-4, should be -5 -all_mxe_octave_builders.append ("w64-64-stable-on-debian") ## jwe-debian-x86_64-4, should be -5 +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-4, should be -5 -all_mxe_octave_builders.append ("mxe-native-all-on-debian") ## jwe-debian-x86_64-4, should be -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 c["schedulers"] = [] @@ -568,15 +565,15 @@ c["builders"] = [] c["builders"].append (BuilderConfig (name = "gcc-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-4"], factory = mk_gcc_factory (19, "-j16", "default"))) c["builders"].append (BuilderConfig (name = "gcc-lto-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-4"], factory = mk_gcc_lto_factory (19, "-j16", "default"))) c["builders"].append (BuilderConfig (name = "clang-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-5"], factory = mk_clang_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "gcc-fedora", @@ -592,7 +589,7 @@ factory = mk_clang_factory (19, "-j4", "default"))) c["builders"].append (BuilderConfig (name = "no-extras-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-4"], factory = mk_no_extras_factory (19, "-j16", "default"))) #c["builders"].append (BuilderConfig (name = "gcc-6-debian", @@ -609,15 +606,15 @@ c["builders"].append (BuilderConfig (name = "stable-gcc-debian", - workernames = ["jwe-debian-x86_64-4"], + workernames = ["jwe-debian-x86_64-5"], factory = mk_gcc_factory (19, "-j16", "stable"))) c["builders"].append (BuilderConfig (name = "stable-gcc-lto-debian", - workernames = ["jwe-debian-x86_64-4"], + workernames = ["jwe-debian-x86_64-5"], factory = mk_gcc_lto_factory (19, "-j16", "stable"))) c["builders"].append (BuilderConfig (name = "stable-clang-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-5"], factory = mk_clang_factory (19, "-j8", "stable"))) c["builders"].append (BuilderConfig (name = "stable-gcc-fedora", @@ -629,7 +626,7 @@ factory = mk_clang_factory (19, "-j4", "stable"))) c["builders"].append (BuilderConfig (name = "stable-no-extras-debian", - workernames = ["jwe-debian-x86_64-4"], + workernames = ["jwe-debian-x86_64-5"], factory = mk_no_extras_factory (19, "-j16", "stable"))) #c["builders"].append (BuilderConfig (name = "stable-clang-osx", @@ -844,7 +841,7 @@ ["nsis-installer", "7z-dist"]) c["builders"].append (BuilderConfig (name = "w64-32-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-5"], factory = w64_32_factory)) w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], @@ -854,7 +851,7 @@ ["nsis-installer", "7z-dist"]) c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-5"], factory = w64_32_factory)) w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], @@ -864,7 +861,7 @@ ["nsis-installer", "7z-dist"]) c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-5"], factory = w64_32_factory)) @@ -875,7 +872,7 @@ ["nsis-installer", "7z-dist"]) c["builders"].append (BuilderConfig (name = "w64-64-on-debian", - workernames = ["jwe-debian-x86_64-4"], + workernames = ["jwe-debian-x86_64-5"], factory = w64_64_factory)) w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2], @@ -885,7 +882,7 @@ ["nsis-installer", "7z-dist"]) c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", - workernames = ["jwe-debian-x86_64-4"], + workernames = ["jwe-debian-x86_64-5"], factory = w64_64_factory)) w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2], @@ -895,7 +892,7 @@ ["nsis-installer", "7z-dist"]) c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", - workernames = ["jwe-debian-x86_64-4"], + workernames = ["jwe-debian-x86_64-5"], factory = w64_64_factory)) @@ -905,7 +902,7 @@ "tar-dist") c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-5"], factory = native_factory)) @@ -915,7 +912,7 @@ "tar-dist") c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian", - workernames = ["jwe-debian-x86_64-4"], ## should be -5 + workernames = ["jwe-debian-x86_64-5"], factory = native_all_factory))