diff options
| author |   Vanessa Valderrama <vvalderrama@linuxfoundation.org> | 2023-08-07 15:23:05 -0500 |
|---|---|---|
| committer | Vanessa Valderrama <vvalderrama@linuxfoundation.org> | 2023-08-23 12:40:42 -0500 |
| commit | 8e7113593c995bb10b004f6fa638f484b6b8e2ba (patch) | |
| tree | 5718a26de269d722c5862fde8b7c9e4d860afa4b /jenkins-config/clouds/nomad/FDIONOMAD | |
| parent | 6eb48ef838d3968c94f707dde5c686b1b5a23f0f (diff) | |
Chore: Modify Nomad configs
Modifying Nomad configs with updates from the latest Nomad plugin
Change-Id: I06b34f3202d0ad511274a38b472239dd7a1ea537
Signed-off-by: Vanessa Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jenkins-config/clouds/nomad/FDIONOMAD')
48 files changed, 462 insertions, 244 deletions
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..a7b8a792 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-debian11:prod-x86_64 + volumes: + - /tmp/ccache.debian11:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml index a56d0d54..94ffb83a 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-debian11:prod-x86_64" - labels: "builder-debian11-prod-x86_64" + - labels: "builder-debian11-prod-x86_64" prefix: "builder-debian11-prod-x86_64" - hostVolumes: "/tmp/ccache.debian11:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..f41b11eb --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-debian11:sandbox-x86_64 + volumes: + - /tmp/ccache.debian11:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml index 7d8cd023..261a4906 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-debian11:sandbox-x86_64" - labels: "builder-debian11-sandbox-x86_64" + - labels: "builder-debian11-sandbox-x86_64" prefix: "builder-debian11-sandbox-x86_64" - hostVolumes: "/tmp/ccache.debian11:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..8b0164e9 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64-jobtemplate.yaml @@ -0,0 +1,11 @@ +--- +Job: + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2004:prod-aarch64 + volumes: + - /tmp/ccache.ubuntu2004:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml index 7392a34b..5e192fd8 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - - image: "fdiotools/builder-ubuntu2004:prod-aarch64" - labels: "builder-ubuntu2004-prod-aarch64" + - labels: "builder-ubuntu2004-prod-aarch64" prefix: "builder-ubuntu2004-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..6766fc3d --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2004:prod-x86_64 + volumes: + - /tmp/ccache.ubuntu2004:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml index af37e2cc..2e9ffa50 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2004:prod-x86_64" - labels: "builder-ubuntu2004-prod-x86_64" + - labels: "builder-ubuntu2004-prod-x86_64" prefix: "builder-ubuntu2004-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..88990b9e --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml @@ -0,0 +1,11 @@ +--- +Job: + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2004:sandbox-aarch64 + volumes: + - /tmp/ccache.ubuntu2004:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml index 929dfc13..21655cef 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - - image: "fdiotools/builder-ubuntu2004:sandbox-aarch64" - labels: "builder-ubuntu2004-sandbox-aarch64" + - labels: "builder-ubuntu2004-sandbox-aarch64" prefix: "builder-ubuntu2004-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..3668cca3 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2004:sandbox-x86_64 + volumes: + - /tmp/ccache.ubuntu2004:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml index c0cc1cff..dd19cd4f 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2004:sandbox-x86_64" - labels: "builder-ubuntu2004-sandbox-x86_64" + - labels: "builder-ubuntu2004-sandbox-x86_64" prefix: "builder-ubuntu2004-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..096f7922 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64-jobtemplate.yaml @@ -0,0 +1,11 @@ +--- +Job: + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml index b0bb1419..72924b66 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - - image: "fdiotools/builder-ubuntu2204:prod-aarch64" - labels: "builder-ubuntu2204-prod-aarch64" + - labels: "builder-ubuntu2204-prod-aarch64" prefix: "builder-ubuntu2204-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..33260452 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-x86_64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml index 37945eff..cc704916 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:prod-x86_64" - labels: "builder-ubuntu2204-prod-x86_64" + - labels: "builder-ubuntu2204-prod-x86_64" prefix: "builder-ubuntu2204-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..10a1595a --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml @@ -0,0 +1,11 @@ +--- +Job: + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:sandbox-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml index 603cf66b..bb67daae 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - - image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" - labels: "builder-ubuntu2204-sandbox-aarch64" + - labels: "builder-ubuntu2204-sandbox-aarch64" prefix: "builder-ubuntu2204-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..a48458d2 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:sandbox-x86_64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml index bfb82317..d4b8a3a8 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" - labels: "builder-ubuntu2204-sandbox-x86_64" + - labels: "builder-ubuntu2204-sandbox-x86_64" prefix: "builder-ubuntu2204-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..28fa85d6 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: arm64 + - LTarget: ^${node.class} + Operand: = + RTarget: csitarm + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml index d13b9b15..85445a3d 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csitarm" - image: "fdiotools/builder-ubuntu2204:prod-aarch64" - labels: "csit-builder-ubuntu2204-prod-aarch64" + - labels: "csit-builder-ubuntu2204-prod-aarch64" prefix: "csit-builder-ubuntu2204-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..c35116f6 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: csit + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-x86_64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml index b09cdce2..158970c9 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csit" - image: "fdiotools/builder-ubuntu2204:prod-x86_64" - labels: "csit-builder-ubuntu2204-prod-x86_64" + - labels: "csit-builder-ubuntu2204-prod-x86_64" prefix: "csit-builder-ubuntu2204-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..8b1dfe3d --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: arm64 + - LTarget: ^${node.class} + Operand: = + RTarget: csitarm + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:sandbox-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml index e9792926..1d62b706 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csitarm" - image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" - labels: "csit-builder-ubuntu2204-sandbox-aarch64" + - labels: "csit-builder-ubuntu2204-sandbox-aarch64" prefix: "csit-builder-ubuntu2204-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..16d499a2 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml @@ -0,0 +1,18 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: csit + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:sandbox-x86_64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml index 2e400fe7..12ff6d08 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml @@ -1,13 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csit" - image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" - labels: "csit-builder-ubuntu2204-sandbox-x86_64" + - labels: "csit-builder-ubuntu2204-sandbox-x86_64" prefix: "csit-builder-ubuntu2204-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml index 87e2ee0d..e868998b 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml @@ -1,31 +1,7 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - datacenters: "yul1" - cpu: 24000 - memory: 24000 - disk: 3000 - priority: 50 - idleTerminationInMinutes: 10 + - idleTerminationInMinutes: 10 numExecutors: 1 - prefixCmd: "" - forcePull: true - hostVolumes: "/scratch/nomad:/scratch/nomad:ro" - privileged: true - reusable: false - useRawExec: false - network: "bridge" - region: "global" remoteFs: "/w" - username: "fdionomad" - password: "hidden" - capAdd: "" - capDrop: "" - securityOpt: "" - extraHosts: "" + reusable: false + jobTemplate: |- diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml new file mode 100644 index 00000000..5ad400e2 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml @@ -0,0 +1,66 @@ +--- +Job: + ID: '%WORKER_NAME%' + Name: '%WORKER_NAME%' + Region: global + Type: batch + Priority: 50 + Datacenters: + - yul1 + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: arm64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Count: 1 + Tasks: + - Name: jenkins-worker + Driver: docker + Config: + args: + - -cp + - /local/slave.jar + - hudson.remoting.jnlp.Main + - -headless + - -url + - https://jenkins.fd.io/sandbox + - -workDir + - /w/ + - '%WORKER_SECRET%' + - '%WORKER_NAME%' + privileged: true + image: fdiotools/builder-ubuntu2204:sandbox-aarch64 + auth: + - password: dh1$NFD.io + username: fdionomad + network_mode: bridge + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + command: java + force_pull: true + Resources: + CPU: 24000 + MemoryMB: 24000 + Networks: + - MBits: 1 + ReservedPorts: [] + Devices: [] + LogConfig: + MaxFiles: 1 + MaxFileSizeMB: 10 + Artifacts: + - RelativeDest: /local/ + RestartPolicy: + Interval: 10000000000 + Mode: fail + Delay: 1000000000 + Attempts: 0 + EphemeralDisk: + SizeMB: 3000 + Migrate: false + Sticky: false diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..ffda828d --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml @@ -0,0 +1,14 @@ +--- +Job: + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + CPU: 8000 + MemoryMB: 8192 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml index 8d25c3af..059cf30d 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml @@ -1,15 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:prod-aarch64" - cpu: 8000 - memory: 8192 - labels: "m-builder-ubuntu2204-prod-aarch64" + - labels: "m-builder-ubuntu2204-prod-aarch64" prefix: "m-builder-ubuntu2204-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..63896a8a --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml @@ -0,0 +1,21 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-x86_64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + CPU: 8000 + MemoryMB: 8192 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml index 160119fa..28e82e13 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml @@ -1,15 +1,6 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:prod-x86_64" - cpu: 8000 - memory: 8192 + - CPU: 8000 + MemoryMB: 8192 labels: "m-builder-ubuntu2204-prod-x86_64" prefix: "m-builder-ubuntu2204-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..cc8dac7e --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml @@ -0,0 +1,15 @@ +--- +Job: + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + args: + image: fdiotools/builder-ubuntu2204:sandbox-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + CPU: 8000 + MemoryMB: 8192 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml index 0137b27a..dccbdf26 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml @@ -1,15 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" - cpu: 8000 - memory: 8192 - labels: "m-builder-ubuntu2204-sandbox-aarch64" + - labels: "m-builder-ubuntu2204-sandbox-aarch64" prefix: "m-builder-ubuntu2204-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..bfabba61 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml @@ -0,0 +1,21 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:sandbox-x86_64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + CPU: 8000 + MemoryMB: 8192 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml index c73c5aa7..997a1d2f 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml @@ -1,15 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" - cpu: 8000 - memory: 8192 - labels: "m-builder-ubuntu2204-sandbox-x86_64" + - labels: "m-builder-ubuntu2204-sandbox-x86_64" prefix: "m-builder-ubuntu2204-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml index 617a838c..5fe65b08 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml @@ -2,12 +2,10 @@ jenkins: clouds: - nomad: - jenkinsUrl: "https://jenkins.fd.io/" + url: "https://jenkins.fd.io/" name: "FDIONOMAD" nomadUrl: "http://10.30.51.23:4646" - jenkinsTunnel: "" - prune: false - nomadACLCredentialsId: "" + prune: "false" workerTimeout: 5 - workerUrl: "https://jenkins.fd.io/jnlpJars/slave.jar" + GetterSource: "https://jenkins.fd.io/jnlpJars/slave.jar" templates: diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..0565f10c --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml @@ -0,0 +1,14 @@ +--- +Job: + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + CPU: 4000 + MemoryMB: 4096 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml index 11cab484..fc6e3c97 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml @@ -1,15 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:prod-aarch64" - cpu: 4000 - memory: 4096 - labels: "s-builder-ubuntu2204-prod-aarch64" + - labels: "s-builder-ubuntu2204-prod-aarch64" prefix: "s-builder-ubuntu2204-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..5f76c9ff --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml @@ -0,0 +1,21 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-x86_64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + CPU: 4000 + MemoryMB: 4096 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml index 352e4e7a..c9528db9 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml @@ -1,15 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:prod-x86_64" - cpu: 4000 - memory: 4096 - labels: "s-builder-ubuntu2204-prod-x86_64" + - labels: "s-builder-ubuntu2204-prod-x86_64" prefix: "s-builder-ubuntu2204-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml new file mode 100644 index 00000000..d49709e0 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml @@ -0,0 +1,14 @@ +--- +Job: + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:sandbox-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + CPU: 4000 + MemoryMB: 4096 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml index 8787e7ef..4e9aa3ee 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml @@ -1,15 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" - cpu: 4000 - memory: 4096 - labels: "s-builder-ubuntu2204-sandbox-aarch64" + - labels: "s-builder-ubuntu2204-sandbox-aarch64" prefix: "s-builder-ubuntu2204-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml new file mode 100644 index 00000000..f99da862 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml @@ -0,0 +1,21 @@ +--- +Job: + Contstraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: builder + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:sandbox-x86_64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + CPU: 4000 + MemoryMB: 4096 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml index adc70787..4bb88768 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml @@ -1,15 +1,4 @@ --- templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" - cpu: 4000 - memory: 4096 - labels: "s-builder-ubuntu2204-sandbox-x86_64" + - labels: "s-builder-ubuntu2204-sandbox-x86_64" prefix: "s-builder-ubuntu2204-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml index 5585ddab..f46e09bf 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml @@ -2,12 +2,9 @@ jenkins: clouds: - nomad: - jenkinsUrl: "https://jenkins.fd.io/sandbox" + url: "https://jenkins.fd.io/sandbox" name: "FDIONOMAD" nomadUrl: "http://10.30.51.23:4646" - jenkinsTunnel: "" - prune: false - nomadACLCredentialsId: "" workerTimeout: 5 - workerUrl: "https://jenkins.fd.io/sandbox/jnlpJars/slave.jar" + GetterSource: "https://jenkins.fd.io/sandbox/jnlpJars/slave.jar" templates: |