feat(cloud): Cleanup Nomad templates

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: Ifc63591730b5398093fbeff3b5e12e1e070641f9

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
deleted file mode 100644 (file)
index 2118e50..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-Job:
-  Constraints:
-    - 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
deleted file mode 100644 (file)
index 9c9324e..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "csit-builder-ubuntu2204-prod-aarch64"
-    labels: "csit-builder-ubuntu2204-prod-aarch64"

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
deleted file mode 100644 (file)
index 3ac4b88..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-Job:
-  Constraints:
-    - 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
deleted file mode 100644 (file)
index 492353a..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "csit-builder-ubuntu2204-prod-x86_64"
-    labels: "csit-builder-ubuntu2204-prod-x86_64"

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
deleted file mode 100644 (file)
index ee0f254..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: arm64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: csitarm
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2204:sandbox-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2204:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

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
deleted file mode 100644 (file)
index 03e4587..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "csit-builder-ubuntu2204-sandbox-aarch64"
-    labels: "csit-builder-ubuntu2204-sandbox-aarch64"

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
deleted file mode 100644 (file)
index a803e9f..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: csit
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2204:sandbox-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2204:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

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
deleted file mode 100644 (file)
index 2390750..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "csit-builder-ubuntu2204-sandbox-x86_64"
-    labels: "csit-builder-ubuntu2204-sandbox-x86_64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-aarch64-jobtemplate.yaml
deleted file mode 100644 (file)
index 514305b..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-Job:
-  Constraints:
-    - 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-ubuntu2404:prod-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2404:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-aarch64.yaml
deleted file mode 100644 (file)
index a3fba0a..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "csit-builder-ubuntu2404-prod-aarch64"
-    labels: "csit-builder-ubuntu2404-prod-aarch64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-x86_64-jobtemplate.yaml
deleted file mode 100644 (file)
index fb46d16..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-Job:
-  Constraints:
-    - 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-ubuntu2404:prod-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2404:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-x86_64.yaml
deleted file mode 100644 (file)
index 5a5e691..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-prod-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "csit-builder-ubuntu2404-prod-x86_64"
-    labels: "csit-builder-ubuntu2404-prod-x86_64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-aarch64-jobtemplate.yaml
deleted file mode 100644 (file)
index 9f34823..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: arm64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: csitarm
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2404:sandbox-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2404:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-aarch64.yaml
deleted file mode 100644 (file)
index 56a0448..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "csit-builder-ubuntu2404-sandbox-aarch64"
-    labels: "csit-builder-ubuntu2404-sandbox-aarch64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-x86_64-jobtemplate.yaml
deleted file mode 100644 (file)
index e92976e..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: csit
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2404:sandbox-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2404:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-x86_64.yaml
deleted file mode 100644 (file)
index 46b7dae..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2404-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "csit-builder-ubuntu2404-sandbox-x86_64"
-    labels: "csit-builder-ubuntu2404-sandbox-x86_64"

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
deleted file mode 100644 (file)
index ffda828..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-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
deleted file mode 100644 (file)
index c145f63..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "m-builder-ubuntu2204-prod-aarch64"
-    labels: "m-builder-ubuntu2204-prod-aarch64"

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
deleted file mode 100644 (file)
index d0ade86..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-Job:
-  Constraints:
-    - 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
deleted file mode 100644 (file)
index 474b881..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "m-builder-ubuntu2204-prod-x86_64"
-    labels: "m-builder-ubuntu2204-prod-x86_64"

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
deleted file mode 100644 (file)
index 1baef1d..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-Job:
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2204:sandbox-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2204:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Resources:
-            CPU: 8000
-            MemoryMB: 8192
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

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
deleted file mode 100644 (file)
index b5cba5d..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "m-builder-ubuntu2204-sandbox-aarch64"
-    labels: "m-builder-ubuntu2204-sandbox-aarch64"

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
deleted file mode 100644 (file)
index 82c33cd..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: builder
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2204:sandbox-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2204:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Resources:
-            CPU: 8000
-            MemoryMB: 8192
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

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
deleted file mode 100644 (file)
index 0c6b423..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "m-builder-ubuntu2204-sandbox-x86_64"
-    labels: "m-builder-ubuntu2204-sandbox-x86_64"

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
deleted file mode 100644 (file)
index 0565f10..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-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
deleted file mode 100644 (file)
index 2bbf4f6..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "s-builder-ubuntu2204-prod-aarch64"
-    labels: "s-builder-ubuntu2204-prod-aarch64"

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
deleted file mode 100644 (file)
index 5b19645..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-Job:
-  Constraints:
-    - 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
deleted file mode 100644 (file)
index 74c40ec..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "s-builder-ubuntu2204-prod-x86_64"
-    labels: "s-builder-ubuntu2204-prod-x86_64"

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
deleted file mode 100644 (file)
index 0bff740..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-Job:
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2204:sandbox-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2204:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Resources:
-            CPU: 4000
-            MemoryMB: 4096
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

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
deleted file mode 100644 (file)
index 624b14d..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "s-builder-ubuntu2204-sandbox-aarch64"
-    labels: "s-builder-ubuntu2204-sandbox-aarch64"

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
deleted file mode 100644 (file)
index e189d48..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: builder
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2204:sandbox-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2204:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Resources:
-            CPU: 4000
-            MemoryMB: 4096
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

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
deleted file mode 100644 (file)
index 278a505..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "s-builder-ubuntu2204-sandbox-x86_64"
-    labels: "s-builder-ubuntu2204-sandbox-x86_64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-aarch64-jobtemplate.yaml
deleted file mode 100644 (file)
index 0de9cb6..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-Job:
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            image: fdiotools/builder-ubuntu2404:prod-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2404:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Resources:
-            CPU: 4000
-            MemoryMB: 4096

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-aarch64.yaml
deleted file mode 100644 (file)
index afba2c5..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "s-builder-ubuntu2404-prod-aarch64"
-    labels: "s-builder-ubuntu2404-prod-aarch64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-x86_64-jobtemplate.yaml
deleted file mode 100644 (file)
index 8e57a90..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-Job:
-  Constraints:
-    - 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-ubuntu2404:prod-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2404:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Resources:
-            CPU: 4000
-            MemoryMB: 4096

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-x86_64.yaml
deleted file mode 100644 (file)
index 9a80fbd..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-prod-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "s-builder-ubuntu2404-prod-x86_64"
-    labels: "s-builder-ubuntu2404-prod-x86_64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-aarch64-jobtemplate.yaml
deleted file mode 100644 (file)
index f7072f8..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-Job:
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2404:sandbox-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2404:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Resources:
-            CPU: 4000
-            MemoryMB: 4096
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-aarch64.yaml
deleted file mode 100644 (file)
index 662f10f..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "s-builder-ubuntu2404-sandbox-aarch64"
-    labels: "s-builder-ubuntu2404-sandbox-aarch64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-x86_64-jobtemplate.yaml
deleted file mode 100644 (file)
index 16311e8..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: builder
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2404:sandbox-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2404:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Resources:
-            CPU: 4000
-            MemoryMB: 4096
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-x86_64.yaml
deleted file mode 100644 (file)
index 2176918..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2404-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "s-builder-ubuntu2404-sandbox-x86_64"
-    labels: "s-builder-ubuntu2404-sandbox-x86_64"

diff --git a/jjb/csit/csit-terraform.yaml b/jjb/csit/csit-terraform.yaml
index 9bc1c90..e43bed8 100644 (file)
--- a/jjb/csit/csit-terraform.yaml
+++ b/jjb/csit/csit-terraform.yaml
@@ -31,7 +31,7 @@
     name: 'csit-terraform-aws-eb-version-verify-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: 's-builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -77,7 +77,7 @@
     name: 'csit-terraform-aws-eb-version-deploy-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: 's-builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 3796e45..ab8c733 100644 (file)
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -32,7 +32,7 @@
     name: 'csit-verify-tox-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: 's-builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false