# HG changeset patch # User John W. Eaton # Date 1550166071 0 # Node ID 2d30e2976bbe660535151e7a0ddb165432c146fa # Parent e02079ee69d13eff8f1397ba3f1c967b4f460379 reorder jwe workers diff -r e02079ee69d1 -r 2d30e2976bbe master.cfg --- a/master.cfg Fri Feb 08 15:58:06 2019 +0000 +++ b/master.cfg Thu Feb 14 17:41:11 2019 +0000 @@ -114,38 +114,38 @@ #all_default_octave_builders.append ("gcc-4.9-debian") #all_default_octave_builders.append ("gcc-5-debian") all_default_octave_builders.append ("gcc-6-debian") # mtmx -all_default_octave_builders.append ("gcc-7-debian") # jwe 1 -all_default_octave_builders.append ("gcc-7-lto-debian") # jwe 2 +all_default_octave_builders.append ("gcc-7-debian") # jwe 2 +all_default_octave_builders.append ("gcc-7-lto-debian") # jwe 3 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 1 +all_default_octave_builders.append ("no-extras-debian") # jwe 2 all_default_octave_builders.append ("clang-3.9-debian") # mtmx -all_default_octave_builders.append ("clang-4.0-debian") # jwe 0 -all_default_octave_builders.append ("clang-5.0-debian") # jwe 3 +all_default_octave_builders.append ("clang-4.0-debian") # jwe 1 +all_default_octave_builders.append ("clang-5.0-debian") # jwe 0 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-7-debian") # jwe 1 -all_stable_octave_builders.append ("stable-gcc-7-lto-debian") # jwe 2 +all_stable_octave_builders.append ("stable-gcc-7-debian") # jwe 2 +all_stable_octave_builders.append ("stable-gcc-7-lto-debian") # jwe 3 all_stable_octave_builders.append ("stable-gcc-fedora") # das -all_stable_octave_builders.append ("stable-no-extras-debian") # jwe 1 -all_stable_octave_builders.append ("stable-clang-4.0-debian") # jwe 0 -all_stable_octave_builders.append ("stable-clang-5.0-debian") # jwe 3 +all_stable_octave_builders.append ("stable-no-extras-debian") # jwe 2 +all_stable_octave_builders.append ("stable-clang-4.0-debian") # jwe 1 +all_stable_octave_builders.append ("stable-clang-5.0-debian") # jwe 0 all_stable_octave_builders.append ("stable-clang-osx") # simone all_mxe_octave_builders = []; -all_mxe_octave_builders.append ("w32-on-debian") # jwe 3 -all_mxe_octave_builders.append ("w64-32-on-debian") # jwe 0 -all_mxe_octave_builders.append ("w64-64-on-debian") # jwe 2 -all_mxe_octave_builders.append ("w32-release-on-debian") # jwe 3 -all_mxe_octave_builders.append ("w64-32-release-on-debian") # jwe 0 -all_mxe_octave_builders.append ("w64-64-release-on-debian") # jwe 2 -all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe 3 -all_mxe_octave_builders.append ("w64-32-stable-on-debian") # jwe 0 -all_mxe_octave_builders.append ("w64-64-stable-on-debian") # jwe 2 -all_mxe_octave_builders.append ("mxe-native-on-debian") # jwe 0 -all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe 2 +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 3 +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 3 +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 3 +all_mxe_octave_builders.append ("mxe-native-on-debian") # jwe 1 +all_mxe_octave_builders.append ("mxe-native-all-on-debian") # jwe 3 c["schedulers"] = [] @@ -540,11 +540,11 @@ c["builders"] = [] #c["builders"].append (BuilderConfig (name = "gcc-4.9-debian", -# workernames = ["jwe-debian-x86_64-0"], +# workernames = ["jwe-debian-x86_64-1"], # factory = mk_gcc_4_9_factory (19, "-j8", "default"))) #c["builders"].append (BuilderConfig (name = "gcc-5-debian", -# workernames = ["jwe-debian-x86_64-0"], +# workernames = ["jwe-debian-x86_64-1"], # factory = mk_gcc_5_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "gcc-6-debian", @@ -552,19 +552,19 @@ factory = mk_gcc_6_factory (10, "-j2", "default"))) c["builders"].append (BuilderConfig (name = "gcc-7-debian", - workernames = ["jwe-debian-x86_64-1"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_gcc_7_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "stable-gcc-7-debian", - workernames = ["jwe-debian-x86_64-1"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_gcc_7_factory (19, "-j8", "stable"))) c["builders"].append (BuilderConfig (name = "gcc-7-lto-debian", - workernames = ["jwe-debian-x86_64-2"], + workernames = ["jwe-debian-x86_64-3"], factory = mk_gcc_7_lto_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "stable-gcc-7-lto-debian", - workernames = ["jwe-debian-x86_64-2"], + workernames = ["jwe-debian-x86_64-3"], factory = mk_gcc_7_lto_factory (19, "-j8", "stable"))) c["builders"].append (BuilderConfig (name = "gcc-fedora", @@ -580,15 +580,15 @@ factory = mk_gcc_lto_factory (10, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "no-extras-debian", - workernames = ["jwe-debian-x86_64-1"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_no_extras_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "stable-no-extras-debian", - workernames = ["jwe-debian-x86_64-1"], + workernames = ["jwe-debian-x86_64-2"], factory = mk_no_extras_factory (19, "-j8", "stable"))) ##c["builders"].append (BuilderConfig (name = "clang-3.8-debian", -## workernames = ["jwe-debian-x86_64-2"], +## workernames = ["jwe-debian-x86_64-3"], ## factory = mk_clang_3_8_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "clang-3.9-debian", @@ -596,19 +596,19 @@ factory = mk_clang_3_9_factory (19, "-j2", "default"))) c["builders"].append (BuilderConfig (name = "clang-4.0-debian", - workernames = ["jwe-debian-x86_64-0"], + workernames = ["jwe-debian-x86_64-1"], factory = mk_clang_4_0_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "stable-clang-4.0-debian", - workernames = ["jwe-debian-x86_64-0"], + workernames = ["jwe-debian-x86_64-1"], factory = mk_clang_4_0_factory (19, "-j8", "stable"))) c["builders"].append (BuilderConfig (name = "clang-5.0-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-0"], factory = mk_clang_5_0_factory (19, "-j8", "default"))) c["builders"].append (BuilderConfig (name = "stable-clang-5.0-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-0"], factory = mk_clang_5_0_factory (19, "-j8", "stable"))) c["builders"].append (BuilderConfig (name = "clang-fedora", @@ -772,57 +772,57 @@ c["builders"].append (BuilderConfig (name = "w32-on-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-0"], factory = mk_w32_factory (19, 8, "default", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-on-debian", - workernames = ["jwe-debian-x86_64-0"], + workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "default", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-on-debian", - workernames = ["jwe-debian-x86_64-2"], + workernames = ["jwe-debian-x86_64-3"], factory = mk_w64_64_factory (19, 8, "default", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-release-on-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-0"], factory = mk_w32_factory (19, 8, "release", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", - workernames = ["jwe-debian-x86_64-0"], + workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "release", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", - workernames = ["jwe-debian-x86_64-2"], + workernames = ["jwe-debian-x86_64-3"], factory = mk_w64_64_factory (19, 8, "release", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w32-stable-on-debian", - workernames = ["jwe-debian-x86_64-3"], + workernames = ["jwe-debian-x86_64-0"], factory = mk_w32_factory (19, 8, "stable", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", - workernames = ["jwe-debian-x86_64-0"], + workernames = ["jwe-debian-x86_64-1"], factory = mk_w64_32_factory (19, 8, "stable", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", - workernames = ["jwe-debian-x86_64-2"], + workernames = ["jwe-debian-x86_64-3"], factory = mk_w64_64_factory (19, 8, "stable", ["nsis-installer", "7z-dist"]))) c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", - workernames = ["jwe-debian-x86_64-0"], + 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", - workernames = ["jwe-debian-x86_64-2"], + workernames = ["jwe-debian-x86_64-3"], factory = mk_native_all_factory (19, 8, "default", "tar-dist")))