diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-24 10:06:42 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-24 10:06:42 +0100 |
| commit | 725b998aa023d6b04a7d8141609c8448d4d82098 (patch) | |
| tree | 1b6822e4148dd746abd8a88a5adb3064884d739d /clusters | |
| parent | 826f0cff22511204a1fde979e954469852227646 (diff) | |
| parent | 1a542e3e3d8831add80f2c1f5a4390fc0170e9e5 (diff) | |
| download | definitions-725b998aa023d6b04a7d8141609c8448d4d82098.tar.gz | |
Merge remote-tracking branch 'origin/baserock/sam/build-and-devel-systems'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Diffstat (limited to 'clusters')
| -rw-r--r-- | clusters/example-distbuild-cluster.morph | 2 | ||||
| -rw-r--r-- | clusters/mason.morph | 2 | ||||
| -rw-r--r-- | clusters/release.morph | 28 |
3 files changed, 16 insertions, 16 deletions
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 diff --git a/clusters/release.morph b/clusters/release.morph index 73ccfbc9..5466df22 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -7,33 +7,33 @@ description: | you can deploy the systems yourself, if you are making a Baserock release then the script should be used. systems: -- morph: systems/devel-system-x86_32-chroot.morph +- morph: systems/build-system-x86_32-chroot.morph deploy: - devel-system-x86_32-chroot: + build-system-x86_32-chroot: type: tar - location: devel-system-x86_32-chroot.tar -- morph: systems/devel-system-x86_32-generic.morph + location: build-system-x86_32-chroot.tar +- morph: systems/build-system-x86_32.morph deploy: - devel-system-x86_32-generic: + build-system-x86_32: type: rawdisk - location: devel-system-x86_32-generic.img + location: build-system-x86_32.img DISK_SIZE: 4G -- morph: systems/devel-system-x86_64-chroot.morph +- morph: systems/build-system-x86_64-chroot.morph deploy: - devel-system-x86_64-chroot: + build-system-x86_64-chroot: type: tar - location: devel-system-x86_64-chroot.tar -- morph: systems/devel-system-x86_64-generic.morph + location: build-system-x86_64-chroot.tar +- morph: systems/build-system-x86_64.morph deploy: - devel-system-x86_64-generic: + build-system-x86_64: type: rawdisk - location: devel-system-x86_64-generic.img + location: build-system-x86_64.img DISK_SIZE: 4G -- morph: systems/devel-system-armv7lhf-jetson.morph +- morph: systems/build-system-armv7lhf-jetson.morph deploy: devel-system-armv7lhf-jetson: type: rawdisk - location: devel-system-armv7lhf-jetson.img + location: build-system-armv7lhf-jetson.img DISK_SIZE: 4G ROOT_DEVICE: "/dev/mmcblk0p1" DTB_PATH: "boot/tegra124-pm375.dtb" |