From: Peter Mikus Date: Mon, 25 Aug 2025 07:16:04 +0000 (+0200) Subject: feat(cloud): Cleanup Nomad templates X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=6e4ce256e05f84418229a7c7742bbe03b074d1f1;p=ci-management.git feat(cloud): Cleanup Nomad templates Signed-off-by: Peter Mikus 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 index 2118e50bc..000000000 --- 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 index 9c9324eca..000000000 --- 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 index 3ac4b888e..000000000 --- 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 index 492353a58..000000000 --- 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 index ee0f2549d..000000000 --- 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 index 03e458795..000000000 --- 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 index a803e9fd1..000000000 --- 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 index 2390750cc..000000000 --- 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 index 514305bd9..000000000 --- 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 index a3fba0ad6..000000000 --- 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 index fb46d169a..000000000 --- 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 index 5a5e6918b..000000000 --- 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 index 9f34823e3..000000000 --- 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 index 56a04489f..000000000 --- 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 index e92976e06..000000000 --- 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 index 46b7dae6a..000000000 --- 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 index ffda828dc..000000000 --- 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 index c145f630c..000000000 --- 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 index d0ade86c2..000000000 --- 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 index 474b8818c..000000000 --- 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 index 1baef1d70..000000000 --- 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 index b5cba5d9f..000000000 --- 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 index 82c33cd92..000000000 --- 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 index 0c6b42392..000000000 --- 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 index 0565f10c4..000000000 --- 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 index 2bbf4f621..000000000 --- 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 index 5b196457b..000000000 --- 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 index 74c40ec61..000000000 --- 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 index 0bff740d4..000000000 --- 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 index 624b14d1a..000000000 --- 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 index e189d4878..000000000 --- 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 index 278a50512..000000000 --- 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 index 0de9cb656..000000000 --- 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 index afba2c53d..000000000 --- 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 index 8e57a90a7..000000000 --- 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 index 9a80fbd3e..000000000 --- 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 index f7072f832..000000000 --- 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 index 662f10f5a..000000000 --- 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 index 16311e877..000000000 --- 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 index 2176918b6..000000000 --- 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 9bc1c9059..e43bed847 100644 --- 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 3796e4594..ab8c7336a 100644 --- 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