From 42852ef0fb4bec172d84c2253a7fba15ecea4150 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 22 Oct 2014 11:18:24 +0000 Subject: Rename 'distbuild' system to 'build', and fix descriptions It's better to have one type of system that can do either distributed or local builds than to have separate ones that must both be kept up to date with changes. The need for a separate 'distbuild' stratum went already: commit 1a7fbedf56a4c7a6afb683851dde5d34bbb48b86 Author: Richard Maw Date: Thu Oct 2 14:16:00 2014 +0000 Split morph out of tools morph now contains distbuild and morph-cache-server, so the distbuild stratum can go away, and anything that needs it can now use morph. --- clusters/example-distbuild-cluster.morph | 2 +- clusters/mason.morph | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'clusters') diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph index 4c97d21f..513c16c5 100644 --- a/clusters/example-distbuild-cluster.morph +++ b/clusters/example-distbuild-cluster.morph @@ -10,7 +10,7 @@ description: | workers to authenticate with the Trove to give them read access to all source repositories. systems: -- morph: systems/distbuild-system-x86_64-generic.morph +- morph: systems/build-system-x86_64.morph deploy-defaults: CONTROLLERHOST: build-controller DISTBUILD_CONTROLLER: false diff --git a/clusters/mason.morph b/clusters/mason.morph index 8579f7e4..9717239d 100644 --- a/clusters/mason.morph +++ b/clusters/mason.morph @@ -30,7 +30,7 @@ systems: VCPUS: 2 VERSION_LABEL: 45 WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub -- morph: systems/distbuild-system-x86_64.morph +- morph: systems/build-system-x86_64.morph deploy-defaults: ARTIFACT_CACHE_SERVER: red-box-v1-trove.example.com CONTROLLERHOST: red-box-v1-controller.example.com -- cgit v1.2.1