# HG changeset patch # User John W. Eaton # Date 1629945682 14400 # Node ID ba54973baf45f555204c33bd37e068bbe8f40b9f # Parent dccb2d57f79dde18f28f3060e6c27f9907f127bb redistribute load on jwe systems diff -r dccb2d57f79d -r ba54973baf45 master.cfg --- a/master.cfg Wed Aug 25 22:23:04 2021 -0400 +++ b/master.cfg Wed Aug 25 22:41:22 2021 -0400 @@ -108,37 +108,37 @@ all_default_octave_builders = []; all_default_octave_builders.append ("gcc-6-debian") # mtmx -all_default_octave_builders.append ("gcc-debian") # jwe-3 -all_default_octave_builders.append ("gcc-lto-debian") # jwe-4 +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 ("gcc-fedora") # das all_default_octave_builders.append ("gcc-lto-fedora") # das -all_default_octave_builders.append ("no-extras-debian") # jwe-4 +all_default_octave_builders.append ("no-extras-debian") # jwe-debian-x86_64-5 all_default_octave_builders.append ("clang-3.9-debian") # mtmx -all_default_octave_builders.append ("clang-debian") # jwe-0 +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 ("clang-osx") # simone all_stable_octave_builders = []; -all_stable_octave_builders.append ("stable-gcc-debian") # jwe-3 -all_stable_octave_builders.append ("stable-gcc-lto-debian") # jwe-4 +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-gcc-fedora") # das -all_stable_octave_builders.append ("stable-no-extras-debian") # jwe-4 -all_stable_octave_builders.append ("stable-clang-debian") # jwe-0 +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-0 -all_mxe_octave_builders.append ("w64-32-on-debian") # jwe-1 -all_mxe_octave_builders.append ("w64-64-on-debian") # jwe-4 -all_mxe_octave_builders.append ("w32-release-on-debian") # jwe-0 -all_mxe_octave_builders.append ("w64-32-release-on-debian") # jwe-1 -all_mxe_octave_builders.append ("w64-64-release-on-debian") # jwe-4 -all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe-0 -all_mxe_octave_builders.append ("w64-32-stable-on-debian") # jwe-1 -all_mxe_octave_builders.append ("w64-64-stable-on-debian") # jwe-4 -all_mxe_octave_builders.append ("mxe-native-on-debian") # jwe-3 -all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe-3 +all_mxe_octave_builders.append ("w32-on-debian") # jwe-debian-x86_64-5 +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 ("mxe-native-on-debian") # jwe-debian-x86_64-1 +all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe-debian-x86_64-3 c["schedulers"] = [] @@ -557,15 +557,15 @@ factory = mk_gcc_6_factory (10, "-j2", "default"))) c["builders"].append (BuilderConfig (name = "gcc-debian", - workernames = ["jwe-debian-x86_64-3"], - factory = mk_gcc_factory (19, "-j8", "default"))) + 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-3"], - factory = mk_gcc_factory (19, "-j8", "stable"))) + 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"], + workernames = ["jwe-debian-x86_64-5"], factory = mk_gcc_lto_factory (19, "-j16", "default"))) c["builders"].append (BuilderConfig (name = "stable-gcc-lto-debian", @@ -585,7 +585,7 @@ factory = mk_gcc_lto_factory (10, "-j4", "default"))) c["builders"].append (BuilderConfig (name = "no-extras-debian", - workernames = ["jwe-debian-x86_64-4"], + workernames = ["jwe-debian-x86_64-5"], factory = mk_no_extras_factory (19, "-j16", "default"))) c["builders"].append (BuilderConfig (name = "stable-no-extras-debian", @@ -597,12 +597,12 @@ factory = mk_clang_3_9_factory (19, "-j2", "default"))) c["builders"].append (BuilderConfig (name = "clang-debian", - workernames = ["jwe-debian-x86_64-0"], - factory = mk_clang_factory (19, "-j6", "default"))) + workernames = ["jwe-debian-x86_64-1"], + factory = mk_clang_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "stable-clang-debian", - workernames = ["jwe-debian-x86_64-0"], - factory = mk_clang_factory (19, "-j6", "stable"))) + workernames = ["jwe-debian-x86_64-1"], + factory = mk_clang_factory (19, "-j8", "stable"))) c["builders"].append (BuilderConfig (name = "clang-fedora", workernames = ["das_fc25-x86_64"], @@ -773,14 +773,14 @@ c["builders"].append (BuilderConfig (name = "w32-on-debian", - workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 8, "default", + workernames = ["jwe-debian-x86_64-5"], + factory = mk_w32_factory (19, 16, "default", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-on-debian", - workernames = ["jwe-debian-x86_64-1"], - factory = mk_w64_32_factory (19, 8, "default", + workernames = ["jwe-debian-x86_64-5"], + factory = mk_w64_32_factory (19, 16, "default", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) @@ -791,14 +791,14 @@ ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-release-on-debian", - workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 8, "release", + workernames = ["jwe-debian-x86_64-5"], + factory = mk_w32_factory (19, 16, "release", ["--disable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", - workernames = ["jwe-debian-x86_64-1"], - factory = mk_w64_32_factory (19, 8, "release", + workernames = ["jwe-debian-x86_64-5"], + factory = mk_w64_32_factory (19, 16, "release", ["--disable-system-octave"], ["nsis-installer", "7z-dist"]))) @@ -810,14 +810,14 @@ c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", - workernames = ["jwe-debian-x86_64-0"], - factory = mk_w32_factory (19, 8, "stable", + workernames = ["jwe-debian-x86_64-5"], + factory = mk_w32_factory (19, 16, "stable", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", - workernames = ["jwe-debian-x86_64-1"], - factory = mk_w64_32_factory (19, 8, "stable", + workernames = ["jwe-debian-x86_64-5"], + factory = mk_w64_32_factory (19, 16, "stable", ["--enable-system-octave"], ["nsis-installer", "7z-dist"]))) @@ -828,7 +828,7 @@ ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-1"], factory = mk_native_factory (19, 8, "default", "tar-dist"))) c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian",