Skip to content

Commit 9ccee41

Browse files
committed
docs: config: use the fact that we can now use recursive merges
Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
1 parent aa32a7a commit 9ccee41

1 file changed

Lines changed: 10 additions & 11 deletions

File tree

docs/config.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,22 @@ github:
2727
webhook_secret: Some super secret text
2828

2929
.machines:
30-
cfg-template: &cfg-template
31-
setup_template:
32-
path: /etc/forrest/templates/generic
33-
parameters:
34-
RUNNER_VERSION: "2.318.0"
35-
RUNNER_HASH: "28ed88e4cedf0fc93201a901e392a70463dbd0213f2ce9d57a4ab495027f3e2f"
36-
3730
os-arch: &os-arch
3831
base_image: /srv/forrest/images/Arch-Linux-x86_64-cloudimg.img
3932
os-debian: &os-debian
4033
base_image: /srv/forrest/images/debian-12-generic-amd64.raw
4134

4235
machine-small: &machine-small
36+
setup_template:
37+
path: /etc/forrest/templates/generic
38+
parameters:
39+
RUNNER_VERSION: "2.318.0"
40+
RUNNER_HASH: "28ed88e4cedf0fc93201a901e392a70463dbd0213f2ce9d57a4ab495027f3e2f"
4341
cpus: 4
4442
disk: 16G
4543
ram: 4G
4644
machine-medium: &machine-medium
45+
<< : *machine-small
4746
cpus: 8
4847
disk: 32G
4948
ram: 8G
@@ -54,20 +53,20 @@ repositories:
5453
persistence_token: <PERSISTENCE_TOKEN>
5554
machines:
5655
arch-base:
57-
<< : [*cfg-template, *os-arch, *machine-small]
56+
<< : [*os-arch, *machine-small]
5857
use_base: always
5958
debian-base:
60-
<< : [*cfg-template, *os-debian, *machine-small]
59+
<< : [*os-debian, *machine-small]
6160
use_base: always
6261
debian-yocto:
63-
<< : [*cfg-template, *os-debian, *machine-small]
62+
<< : [*os-debian, *machine-small]
6463
base_machine: hnez/forrest-images/debian-base
6564
use_base: always
6665

6766
forrest-test:
6867
machines:
6968
test-debian:
70-
<< : [*cfg-template, *os-debian, *machine-medium]
69+
<< : [*os-debian, *machine-medium]
7170
base_machine: hnez/forrest-images/debian-base
7271
```
7372

0 commit comments

Comments
 (0)