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>

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 (file)
index 0000000..a7b8a79
--- /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 a56d0d5..94ffb83 100644 (file)
--- 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 (file)
index 0000000..f41b11e
--- /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 7d8cd02..261a490 100644 (file)
--- 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 (file)
index 0000000..8b0164e
--- /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 7392a34..5e192fd 100644 (file)
--- 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 (file)
index 0000000..6766fc3
--- /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 af37e2c..2e9ffa5 100644 (file)
--- 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 (file)
index 0000000..88990b9
--- /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 929dfc1..21655ce 100644 (file)
--- 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 (file)
index 0000000..3668cca
--- /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 c0cc1cf..dd19cd4 100644 (file)
--- 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 (file)
index 0000000..096f792
--- /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 b0bb141..72924b6 100644 (file)
--- 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 (file)
index 0000000..3326045
--- /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 37945ef..cc70491 100644 (file)
--- 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 (file)
index 0000000..10a1595
--- /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 603cf66..bb67daa 100644 (file)
--- 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 (file)
index 0000000..a48458d
--- /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 bfb8231..d4b8a3a 100644 (file)
--- 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 (file)
index 0000000..28fa85d
--- /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 d13b9b1..85445a3 100644 (file)
--- 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 (file)
index 0000000..c35116f
--- /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 b09cdce..158970c 100644 (file)
--- 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 (file)
index 0000000..8b1dfe3
--- /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 e979292..1d62b70 100644 (file)
--- 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 (file)
index 0000000..16d499a
--- /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 2e400fe..12ff6d0 100644 (file)
--- 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 87e2ee0..e868998 100644 (file)
--- 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 (file)
index 0000000..5ad400e
--- /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 (file)
index 0000000..ffda828
--- /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 8d25c3a..059cf30 100644 (file)
--- 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 (file)
index 0000000..63896a8
--- /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 160119f..28e82e1 100644 (file)
--- 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 (file)
index 0000000..cc8dac7
--- /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 0137b27..dccbdf2 100644 (file)
--- 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 (file)
index 0000000..bfabba6
--- /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 c73c5aa..997a1d2 100644 (file)
--- 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 617a838..5fe65b0 100644 (file)
--- 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 (file)
index 0000000..0565f10
--- /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 11cab48..fc6e3c9 100644 (file)
--- 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 (file)
index 0000000..5f76c9f
--- /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 352e4e7..c9528db 100644 (file)
--- 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 (file)
index 0000000..d49709e
--- /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 8787e7e..4e9aa3e 100644 (file)
--- 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 (file)
index 0000000..f99da86
--- /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 adc7078..4bb8876 100644 (file)
--- 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 5585dda..f46e09b 100644 (file)
--- 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: