comparison master.cfg @ 55:a66ed5a63f02

redistribute builds on jwe systems and reorder lists
author John W. Eaton <jwe@octave.org>
date Mon, 11 Sep 2023 09:21:33 -0400
parents 92ec1f0534e3
children cd5932f2ce0e
comparison
equal deleted inserted replaced
54:92ec1f0534e3 55:a66ed5a63f02
114 114
115 from buildbot.schedulers.basic import SingleBranchScheduler 115 from buildbot.schedulers.basic import SingleBranchScheduler
116 from buildbot.schedulers.forcesched import ForceScheduler 116 from buildbot.schedulers.forcesched import ForceScheduler
117 from buildbot.schedulers import timed 117 from buildbot.schedulers import timed
118 118
119 ## Builds below that are tagged with jwe-debian-x86_64-5 are currently
120 ## running on jwe-debian-x86_64-4 instead.
121
122 all_default_octave_builders = []; 119 all_default_octave_builders = [];
123 all_default_octave_builders.append ("gcc-debian") ## jwe-debian-x86_64-4, should be -5 120 all_default_octave_builders.append ("gcc-debian") ## jwe-debian-x86_64-4
124 all_default_octave_builders.append ("gcc-lto-debian") ## jwe-debian-x86_64-4, should be -5 121 all_default_octave_builders.append ("gcc-lto-debian") ## jwe-debian-x86_64-4
125 all_default_octave_builders.append ("clang-debian") ## jwe-debian-x86_64-4, should be -5 122 all_default_octave_builders.append ("clang-debian") ## jwe-debian-x86_64-5
126 all_default_octave_builders.append ("gcc-fedora") # das 123 all_default_octave_builders.append ("gcc-fedora") # das
127 all_default_octave_builders.append ("gcc-lto-fedora") # das 124 all_default_octave_builders.append ("gcc-lto-fedora") # das
128 all_default_octave_builders.append ("clang-fedora") # das 125 all_default_octave_builders.append ("clang-fedora") # das
129 all_default_octave_builders.append ("no-extras-debian") ## jwe-debian-x86_64-4, should be -5 126 all_default_octave_builders.append ("no-extras-debian") ## jwe-debian-x86_64-4
130 #all_default_octave_builders.append ("gcc-6-debian") # mtmx 127 #all_default_octave_builders.append ("gcc-6-debian") # mtmx
131 #all_default_octave_builders.append ("clang-3.9-debian") # mtmx 128 #all_default_octave_builders.append ("clang-3.9-debian") # mtmx
132 #all_default_octave_builders.append ("clang-osx") # simone 129 #all_default_octave_builders.append ("clang-osx") # simone
133 130
134 all_stable_octave_builders = []; 131 all_stable_octave_builders = [];
135 all_stable_octave_builders.append ("stable-gcc-debian") # jwe-debian-x86_64-4 132 all_stable_octave_builders.append ("stable-gcc-debian") # jwe-debian-x86_64-5
136 all_stable_octave_builders.append ("stable-gcc-lto-debian") # jwe-debian-x86_64-4 133 all_stable_octave_builders.append ("stable-gcc-lto-debian") # jwe-debian-x86_64-5
137 all_stable_octave_builders.append ("stable-clang-debian") # jwe-debian-x86_64-4 134 all_stable_octave_builders.append ("stable-clang-debian") # jwe-debian-x86_64-5
138 all_stable_octave_builders.append ("stable-gcc-fedora") # das 135 all_stable_octave_builders.append ("stable-gcc-fedora") # das
139 all_stable_octave_builders.append ("stable-clang-fedora") # das 136 all_stable_octave_builders.append ("stable-clang-fedora") # das
140 all_stable_octave_builders.append ("stable-no-extras-debian") # jwe-debian-x86_64-4 137 all_stable_octave_builders.append ("stable-no-extras-debian") # jwe-debian-x86_64-5
141 #all_stable_octave_builders.append ("stable-clang-osx") # simone 138 #all_stable_octave_builders.append ("stable-clang-osx") # simone
142 139
143 all_mxe_octave_builders = []; 140 all_mxe_octave_builders = [];
144 all_mxe_octave_builders.append ("w32-on-debian") # jwe-debian-x86_64-4 141 all_mxe_octave_builders.append ("w32-on-debian") # jwe-debian-x86_64-4
145 all_mxe_octave_builders.append ("w32-release-on-debian") # jwe-debian-x86_64-4 142 all_mxe_octave_builders.append ("w32-release-on-debian") # jwe-debian-x86_64-4
146 all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe-debian-x86_64-4 143 all_mxe_octave_builders.append ("w32-stable-on-debian") # jwe-debian-x86_64-4
147 144
148 all_mxe_octave_builders.append ("w64-32-on-debian") ## jwe-debian-x86_64-4, should be -5 145 all_mxe_octave_builders.append ("w64-32-on-debian") ## jwe-debian-x86_64-5
149 all_mxe_octave_builders.append ("w64-32-release-on-debian") ## jwe-debian-x86_64-4, should be -5 146 all_mxe_octave_builders.append ("w64-32-release-on-debian") ## jwe-debian-x86_64-5
150 all_mxe_octave_builders.append ("w64-32-stable-on-debian") ## jwe-debian-x86_64-4, should be -5 147 all_mxe_octave_builders.append ("w64-32-stable-on-debian") ## jwe-debian-x86_64-5
151 148
152 all_mxe_octave_builders.append ("w64-64-on-debian") ## jwe-debian-x86_64-4, should be -5 149 all_mxe_octave_builders.append ("w64-64-on-debian") ## jwe-debian-x86_64-5
153 all_mxe_octave_builders.append ("w64-64-release-on-debian") ## jwe-debian-x86_64-4, should be -5 150 all_mxe_octave_builders.append ("w64-64-release-on-debian") ## jwe-debian-x86_64-5
154 all_mxe_octave_builders.append ("w64-64-stable-on-debian") ## jwe-debian-x86_64-4, should be -5 151 all_mxe_octave_builders.append ("w64-64-stable-on-debian") ## jwe-debian-x86_64-5
155 152
156 all_mxe_octave_builders.append ("mxe-native-on-debian") ## jwe-debian-x86_64-4, should be -5 153 all_mxe_octave_builders.append ("mxe-native-on-debian") ## jwe-debian-x86_64-5
157 all_mxe_octave_builders.append ("mxe-native-all-on-debian") ## jwe-debian-x86_64-4, should be -5 154 all_mxe_octave_builders.append ("mxe-native-all-on-debian") ## jwe-debian-x86_64-5
158 155
159 c["schedulers"] = [] 156 c["schedulers"] = []
160 157
161 c["schedulers"].append (SingleBranchScheduler (name = "default octave", 158 c["schedulers"].append (SingleBranchScheduler (name = "default octave",
162 change_filter = octave_default_filter, 159 change_filter = octave_default_filter,
566 from buildbot.config import BuilderConfig 563 from buildbot.config import BuilderConfig
567 564
568 c["builders"] = [] 565 c["builders"] = []
569 566
570 c["builders"].append (BuilderConfig (name = "gcc-debian", 567 c["builders"].append (BuilderConfig (name = "gcc-debian",
571 workernames = ["jwe-debian-x86_64-4"], ## should be -5 568 workernames = ["jwe-debian-x86_64-4"],
572 factory = mk_gcc_factory (19, "-j16", "default"))) 569 factory = mk_gcc_factory (19, "-j16", "default")))
573 570
574 c["builders"].append (BuilderConfig (name = "gcc-lto-debian", 571 c["builders"].append (BuilderConfig (name = "gcc-lto-debian",
575 workernames = ["jwe-debian-x86_64-4"], ## should be -5 572 workernames = ["jwe-debian-x86_64-4"],
576 factory = mk_gcc_lto_factory (19, "-j16", "default"))) 573 factory = mk_gcc_lto_factory (19, "-j16", "default")))
577 574
578 c["builders"].append (BuilderConfig (name = "clang-debian", 575 c["builders"].append (BuilderConfig (name = "clang-debian",
579 workernames = ["jwe-debian-x86_64-4"], ## should be -5 576 workernames = ["jwe-debian-x86_64-5"],
580 factory = mk_clang_factory (19, "-j8", "default"))) 577 factory = mk_clang_factory (19, "-j8", "default")))
581 578
582 c["builders"].append (BuilderConfig (name = "gcc-fedora", 579 c["builders"].append (BuilderConfig (name = "gcc-fedora",
583 workernames = ["das_fc25-x86_64"], 580 workernames = ["das_fc25-x86_64"],
584 factory = mk_gcc_factory (0, "-j4", "default"))) 581 factory = mk_gcc_factory (0, "-j4", "default")))
590 c["builders"].append (BuilderConfig (name = "clang-fedora", 587 c["builders"].append (BuilderConfig (name = "clang-fedora",
591 workernames = ["das_fc25-x86_64"], 588 workernames = ["das_fc25-x86_64"],
592 factory = mk_clang_factory (19, "-j4", "default"))) 589 factory = mk_clang_factory (19, "-j4", "default")))
593 590
594 c["builders"].append (BuilderConfig (name = "no-extras-debian", 591 c["builders"].append (BuilderConfig (name = "no-extras-debian",
595 workernames = ["jwe-debian-x86_64-4"], ## should be -5 592 workernames = ["jwe-debian-x86_64-4"],
596 factory = mk_no_extras_factory (19, "-j16", "default"))) 593 factory = mk_no_extras_factory (19, "-j16", "default")))
597 594
598 #c["builders"].append (BuilderConfig (name = "gcc-6-debian", 595 #c["builders"].append (BuilderConfig (name = "gcc-6-debian",
599 # workernames = ["mtmx-debian-x86_64"], 596 # workernames = ["mtmx-debian-x86_64"],
600 # factory = mk_gcc_6_factory (10, "-j2", "default"))) 597 # factory = mk_gcc_6_factory (10, "-j2", "default")))
607 # workernames = ["mtmx-debian-x86_64"], 604 # workernames = ["mtmx-debian-x86_64"],
608 # factory = mk_clang_3_9_factory (19, "-j2", "default"))) 605 # factory = mk_clang_3_9_factory (19, "-j2", "default")))
609 606
610 607
611 c["builders"].append (BuilderConfig (name = "stable-gcc-debian", 608 c["builders"].append (BuilderConfig (name = "stable-gcc-debian",
612 workernames = ["jwe-debian-x86_64-4"], 609 workernames = ["jwe-debian-x86_64-5"],
613 factory = mk_gcc_factory (19, "-j16", "stable"))) 610 factory = mk_gcc_factory (19, "-j16", "stable")))
614 611
615 c["builders"].append (BuilderConfig (name = "stable-gcc-lto-debian", 612 c["builders"].append (BuilderConfig (name = "stable-gcc-lto-debian",
616 workernames = ["jwe-debian-x86_64-4"], 613 workernames = ["jwe-debian-x86_64-5"],
617 factory = mk_gcc_lto_factory (19, "-j16", "stable"))) 614 factory = mk_gcc_lto_factory (19, "-j16", "stable")))
618 615
619 c["builders"].append (BuilderConfig (name = "stable-clang-debian", 616 c["builders"].append (BuilderConfig (name = "stable-clang-debian",
620 workernames = ["jwe-debian-x86_64-4"], ## should be -5 617 workernames = ["jwe-debian-x86_64-5"],
621 factory = mk_clang_factory (19, "-j8", "stable"))) 618 factory = mk_clang_factory (19, "-j8", "stable")))
622 619
623 c["builders"].append (BuilderConfig (name = "stable-gcc-fedora", 620 c["builders"].append (BuilderConfig (name = "stable-gcc-fedora",
624 workernames = ["das_fc25-x86_64"], 621 workernames = ["das_fc25-x86_64"],
625 factory = mk_gcc_factory (0, "-j4", "stable"))) 622 factory = mk_gcc_factory (0, "-j4", "stable")))
627 c["builders"].append (BuilderConfig (name = "stable-clang-fedora", 624 c["builders"].append (BuilderConfig (name = "stable-clang-fedora",
628 workernames = ["das_fc25-x86_64"], 625 workernames = ["das_fc25-x86_64"],
629 factory = mk_clang_factory (19, "-j4", "stable"))) 626 factory = mk_clang_factory (19, "-j4", "stable")))
630 627
631 c["builders"].append (BuilderConfig (name = "stable-no-extras-debian", 628 c["builders"].append (BuilderConfig (name = "stable-no-extras-debian",
632 workernames = ["jwe-debian-x86_64-4"], 629 workernames = ["jwe-debian-x86_64-5"],
633 factory = mk_no_extras_factory (19, "-j16", "stable"))) 630 factory = mk_no_extras_factory (19, "-j16", "stable")))
634 631
635 #c["builders"].append (BuilderConfig (name = "stable-clang-osx", 632 #c["builders"].append (BuilderConfig (name = "stable-clang-osx",
636 # workernames = ["epfl-elcapitan-x86_64"], 633 # workernames = ["epfl-elcapitan-x86_64"],
637 # factory = mk_clang_osx_factory (0, "-j4", "stable"))) 634 # factory = mk_clang_osx_factory (0, "-j4", "stable")))
842 ["--enable-system-octave"], 839 ["--enable-system-octave"],
843 "default-octave", 840 "default-octave",
844 ["nsis-installer", "7z-dist"]) 841 ["nsis-installer", "7z-dist"])
845 842
846 c["builders"].append (BuilderConfig (name = "w64-32-on-debian", 843 c["builders"].append (BuilderConfig (name = "w64-32-on-debian",
847 workernames = ["jwe-debian-x86_64-4"], ## should be -5 844 workernames = ["jwe-debian-x86_64-5"],
848 factory = w64_32_factory)) 845 factory = w64_32_factory))
849 846
850 w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], 847 w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2],
851 "release", "release", 848 "release", "release",
852 ["--disable-system-octave"], 849 ["--disable-system-octave"],
853 "release-octave", 850 "release-octave",
854 ["nsis-installer", "7z-dist"]) 851 ["nsis-installer", "7z-dist"])
855 852
856 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian", 853 c["builders"].append (BuilderConfig (name = "w64-32-release-on-debian",
857 workernames = ["jwe-debian-x86_64-4"], ## should be -5 854 workernames = ["jwe-debian-x86_64-5"],
858 factory = w64_32_factory)) 855 factory = w64_32_factory))
859 856
860 w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2], 857 w64_32_factory = mk_w64_32_factory (19, [1, 16], [8, 2],
861 "stable", "release", 858 "stable", "release",
862 ["--enable-system-octave"], 859 ["--enable-system-octave"],
863 "stable-octave", 860 "stable-octave",
864 ["nsis-installer", "7z-dist"]) 861 ["nsis-installer", "7z-dist"])
865 862
866 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian", 863 c["builders"].append (BuilderConfig (name = "w64-32-stable-on-debian",
867 workernames = ["jwe-debian-x86_64-4"], ## should be -5 864 workernames = ["jwe-debian-x86_64-5"],
868 factory = w64_32_factory)) 865 factory = w64_32_factory))
869 866
870 867
871 w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2], 868 w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2],
872 "default", "default", 869 "default", "default",
873 ["--enable-system-octave"], 870 ["--enable-system-octave"],
874 "default-octave", 871 "default-octave",
875 ["nsis-installer", "7z-dist"]) 872 ["nsis-installer", "7z-dist"])
876 873
877 c["builders"].append (BuilderConfig (name = "w64-64-on-debian", 874 c["builders"].append (BuilderConfig (name = "w64-64-on-debian",
878 workernames = ["jwe-debian-x86_64-4"], 875 workernames = ["jwe-debian-x86_64-5"],
879 factory = w64_64_factory)) 876 factory = w64_64_factory))
880 877
881 w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2], 878 w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2],
882 "release", "release", 879 "release", "release",
883 ["--disable-system-octave"], 880 ["--disable-system-octave"],
884 "release-octave", 881 "release-octave",
885 ["nsis-installer", "7z-dist"]) 882 ["nsis-installer", "7z-dist"])
886 883
887 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian", 884 c["builders"].append (BuilderConfig (name = "w64-64-release-on-debian",
888 workernames = ["jwe-debian-x86_64-4"], 885 workernames = ["jwe-debian-x86_64-5"],
889 factory = w64_64_factory)) 886 factory = w64_64_factory))
890 887
891 w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2], 888 w64_64_factory = mk_w64_64_factory (19, [1, 16], [8, 2],
892 "stable", "release", 889 "stable", "release",
893 ["--enable-system-octave"], 890 ["--enable-system-octave"],
894 "stable-octave", 891 "stable-octave",
895 ["nsis-installer", "7z-dist"]) 892 ["nsis-installer", "7z-dist"])
896 893
897 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian", 894 c["builders"].append (BuilderConfig (name = "w64-64-stable-on-debian",
898 workernames = ["jwe-debian-x86_64-4"], 895 workernames = ["jwe-debian-x86_64-5"],
899 factory = w64_64_factory)) 896 factory = w64_64_factory))
900 897
901 898
902 native_factory = mk_native_factory (19, [1, 16], [8, 2], 899 native_factory = mk_native_factory (19, [1, 16], [8, 2],
903 "default", "default", 900 "default", "default",
904 "default-octave", 901 "default-octave",
905 "tar-dist") 902 "tar-dist")
906 903
907 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian", 904 c["builders"].append (BuilderConfig (name = "mxe-native-on-debian",
908 workernames = ["jwe-debian-x86_64-4"], ## should be -5 905 workernames = ["jwe-debian-x86_64-5"],
909 factory = native_factory)) 906 factory = native_factory))
910 907
911 908
912 native_all_factory = mk_native_all_factory (19, [1, 16], [8, 2], 909 native_all_factory = mk_native_all_factory (19, [1, 16], [8, 2],
913 "default", "default", 910 "default", "default",
914 "default-octave", 911 "default-octave",
915 "tar-dist") 912 "tar-dist")
916 913
917 c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian", 914 c["builders"].append (BuilderConfig (name = "mxe-native-all-on-debian",
918 workernames = ["jwe-debian-x86_64-4"], ## should be -5 915 workernames = ["jwe-debian-x86_64-5"],
919 factory = native_all_factory)) 916 factory = native_all_factory))
920 917
921 918
922 ## PROJECT IDENTITY 919 ## PROJECT IDENTITY
923 920