diff options
| -rw-r--r-- | config.py | 37 | ||||
| -rw-r--r-- | schedulers.py | 2 | ||||
| -rw-r--r-- | workers.py | 2 |
3 files changed, 31 insertions, 10 deletions
@@ -38,7 +38,7 @@ repos = { "meta-gplv2": ["git://git.yoctoproject.org/meta-gplv2", "master"] } -trigger_builders_wait_quick = [ +trigger_builders_wait_shared = [ "qemuarm", "qemuarm-lsb", "qemuarm64", "qemuarm-oecore", "qemumips", "qemumips64", "multilib", @@ -56,15 +56,20 @@ trigger_builders_wait_quick = [ "build-appliance", "buildtools", "eclipse-plugin-neon", "eclipse-plugin-oxygen", "non-gpl3", "wic", "poky-tiny", "musl-qemux86", "musl-qemux86-64", "no-x11", - "qa-extras", "qa-extras2", "oe-selftest", + "qa-extras", "qa-extras2", "check-layer" ] -trigger_builders_wait_full = [ - "qemumips-lsb", "edgerouter-lsb", "mpc8315e-rdb-lsb", "qemuppc-lsb", "qemux86-world-lsb" +trigger_builders_wait_quick = trigger_builders_wait_shared + [ + "oe-selftest" ] -subbuilders = trigger_builders_wait_quick + trigger_builders_wait_full +trigger_builders_wait_full = trigger_builders_wait_shared + [ + "qemumips-lsb", "edgerouter-lsb", "mpc8315e-rdb-lsb", "qemuppc-lsb", "qemux86-world-lsb", + "oe-selftest-ubuntu", "oe-selftest-debian", "oe-selftest-fedora", "oe-selftest-opensuse", "oe-selftest-centos" +] + +subbuilders = list(set(trigger_builders_wait_quick + trigger_builders_wait_full + ["bringup"])) builders = ["quick", "full"] + subbuilders # ## Cluster configuration @@ -76,7 +81,17 @@ publish_dest = "/srv/www/vhosts/autobuilder.yoctoproject.org/pub" web_port = 8010 # List of workers in the cluster -workers = ["example-worker"] +workers_ubuntu = ["ubuntu1804-ty-1", "ubuntu1804-ty-2", "ubuntu1804-ty-3", "ubuntu1604-ty-1"] +workers_centos = ["centos7-ty-1", "centos7-ty-2", "centos7-ty-3", "centos7-ty-4"] +workers_fedora = ["fedora28-ty-1"] +workers_debian = ["debian9-ty-1", "debian8-ty-1", "debian9-ty-2"] +workers_opensuse = ["opensuse423-ty-1"] + +workers = workers_ubuntu + workers_centos + workers_fedora + workers_debian + workers_opensuse + +workers_bringup = ["fedora29-ty-1", "opensuse150-ty-1"] + +all_workers = workers + workers_bringup # Worker configuration, all workers configured the same... # TODO: support per-worker config @@ -86,7 +101,13 @@ notify_on_missing = None # Some builders should only run on specific workers (host OS dependent) builder_to_workers = { - "pkgman-rpm-non-rpm": [], - "pkgman-deb-non-deb": [], + "bringup": workers_bringup, + "pkgman-rpm-non-rpm": workers_ubuntu + workers_debian, + "pkgman-deb-non-deb": workers_fedora + workers_centos + workers_opensuse, + "oe-selftest-ubuntu": workers_ubuntu, + "oe-selftest-debian": workers_debian, + "oe-selftest-fedora": workers_fedora, + "oe-selftest-opensuse": workers_opensuse, + "oe-selftest-centos": workers_centos, "default": workers } diff --git a/schedulers.py b/schedulers.py index 1f2d96f..460e3fc 100644 --- a/schedulers.py +++ b/schedulers.py @@ -85,7 +85,7 @@ wait_quick = sched.Triggerable(name="wait-quick", builderNames=config.trigger_builders_wait_quick) schedulers.append(wait_quick) wait_full = sched.Triggerable(name="wait-full", - builderNames=config.trigger_builders_wait_quick + config.trigger_builders_wait_full) + builderNames=config.trigger_builders_wait_full) schedulers.append(wait_full) def parent_scheduler(target): @@ -3,7 +3,7 @@ from yoctoabb import config workers = [] -for w in config.workers: +for w in config.all_workers: workers.append(worker.Worker(w, config.worker_password, max_builds=config.worker_max_builds, notify_on_missing=config.notify_on_missing)) |