From 40d07c2f5af1a83a8f4a87ea010ec74c80d3a017 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Mon, 19 Sep 2022 22:08:36 -0400 Subject: Unify all FDIONOMAD executor cpu & memory configs. Signed-off-by: Dave Wallace Change-Id: Ib1ed076e1ff9bf0b802d9d9f768ee06469113353 --- .../clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml | 1 - .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml | 1 - .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml | 1 - .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml | 1 - .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml | 1 - .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml | 2 -- .../nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml | 1 - .../nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml | 2 -- .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml | 1 - .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml | 2 -- .../nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml | 1 - .../nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml | 2 -- jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml | 4 ++-- 21 files changed, 2 insertions(+), 34 deletions(-) diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml index d15a462a4..c6134f265 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "builder" - cpu: 14000 image: "fdiotools/builder-debian10:prod-x86_64" labels: "builder-debian10-prod-x86_64" - memory: 14000 prefix: "builder-debian10-prod-x86_64" hostVolumes: "/tmp/ccache.debian10:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml index 8e2293a57..81d49e40e 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "builder" - cpu: 14000 image: "fdiotools/builder-debian10:sandbox-x86_64" labels: "builder-debian10-sandbox-x86_64" - memory: 14000 prefix: "builder-debian10-sandbox-x86_64" hostVolumes: "/tmp/ccache.debian10:/scratch/ccache" 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 fd4b88e46..701e78f9a 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "builder" - cpu: 14000 image: "fdiotools/builder-debian11:prod-x86_64" labels: "builder-debian11-prod-x86_64" - memory: 14000 prefix: "builder-debian11-prod-x86_64" hostVolumes: "/tmp/ccache.debian11:/scratch/ccache" 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 62fbe833e..fceac0248 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "builder" - cpu: 14000 image: "fdiotools/builder-debian11:sandbox-x86_64" labels: "builder-debian11-sandbox-x86_64" - memory: 14000 prefix: "builder-debian11-sandbox-x86_64" hostVolumes: "/tmp/ccache.debian11:/scratch/ccache" 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 cdb22abfc..7d4c78d90 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml @@ -4,4 +4,3 @@ templates: labels: "builder-ubuntu2004-prod-aarch64" prefix: "builder-ubuntu2004-prod-aarch64" hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" - memory: 16000 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 113055840..902083652 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "builder" - cpu: 20000 image: "fdiotools/builder-ubuntu2004:prod-x86_64" labels: "builder-ubuntu2004-prod-x86_64" - memory: 20000 prefix: "builder-ubuntu2004-prod-x86_64" hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" 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 11f7c388b..bfc87f2b0 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml @@ -4,4 +4,3 @@ templates: labels: "builder-ubuntu2004-sandbox-aarch64" prefix: "builder-ubuntu2004-sandbox-aarch64" hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" - memory: 16000 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 b218c615c..9910fdd0a 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "builder" - cpu: 14000 image: "fdiotools/builder-ubuntu2004:sandbox-x86_64" labels: "builder-ubuntu2004-sandbox-x86_64" - memory: 14000 prefix: "builder-ubuntu2004-sandbox-x86_64" hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" 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 c4f8c3780..b4377e91c 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml @@ -4,4 +4,3 @@ templates: labels: "builder-ubuntu2204-prod-aarch64" prefix: "builder-ubuntu2204-prod-aarch64" hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" - memory: 16000 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 529a0bee0..1170d2cce 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "builder" - cpu: 20000 image: "fdiotools/builder-ubuntu2204:prod-x86_64" labels: "builder-ubuntu2204-prod-x86_64" - memory: 20000 prefix: "builder-ubuntu2204-prod-x86_64" hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 69f782318..66a863165 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml @@ -4,4 +4,3 @@ templates: labels: "builder-ubuntu2204-sandbox-aarch64" prefix: "builder-ubuntu2204-sandbox-aarch64" hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" - memory: 16000 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 f9a7ce2c8..3a70830b6 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "builder" - cpu: 14000 image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" labels: "builder-ubuntu2204-sandbox-x86_64" - memory: 14000 prefix: "builder-ubuntu2204-sandbox-x86_64" hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml index 3d9a55197..80a909377 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml @@ -9,5 +9,4 @@ templates: rtarget: "csitarm" image: "fdiotools/builder-ubuntu2004:prod-aarch64" labels: "csit-builder-ubuntu2004-prod-aarch64" - memory: 14000 prefix: "csit-builder-ubuntu2004-prod-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml index 1a903900d..e172415dc 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml @@ -7,8 +7,6 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "csit" - cpu: 15000 image: "fdiotools/builder-ubuntu2004:prod-x86_64" labels: "csit-builder-ubuntu2004-prod-x86_64" - memory: 16000 prefix: "csit-builder-ubuntu2004-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml index ce79143e8..d2f507762 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml @@ -9,5 +9,4 @@ templates: rtarget: "csitarm" image: "fdiotools/builder-ubuntu2004:sandbox-aarch64" labels: "csit-builder-ubuntu2004-sandbox-aarch64" - memory: 14000 prefix: "csit-builder-ubuntu2004-sandbox-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml index 1f0249b89..a68b2f1e2 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml @@ -7,8 +7,6 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "csit" - cpu: 15000 image: "fdiotools/builder-ubuntu2004:sandbox-x86_64" labels: "csit-builder-ubuntu2004-sandbox-x86_64" - memory: 16000 prefix: "csit-builder-ubuntu2004-sandbox-x86_64" 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 95f586e20..4b43d6b75 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml @@ -9,6 +9,5 @@ templates: rtarget: "csitarm" image: "fdiotools/builder-ubuntu2204:prod-aarch64" labels: "csit-builder-ubuntu2204-prod-aarch64" - memory: 24000 prefix: "csit-builder-ubuntu2204-prod-aarch64" hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 79dbd2c8c..07e4bbcf9 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "csit" - cpu: 24000 image: "fdiotools/builder-ubuntu2204:prod-x86_64" labels: "csit-builder-ubuntu2204-prod-x86_64" - memory: 24000 prefix: "csit-builder-ubuntu2204-prod-x86_64" hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 36d6ae831..0f3d12bd6 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml @@ -9,6 +9,5 @@ templates: rtarget: "csitarm" image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" labels: "csit-builder-ubuntu2204-sandbox-aarch64" - memory: 24000 prefix: "csit-builder-ubuntu2204-sandbox-aarch64" hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" 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 847ff65a9..1109b8ccb 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml @@ -7,9 +7,7 @@ templates: - ltarget: "^${node.class}" operand: "=" rtarget: "csit" - cpu: 20000 image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" labels: "csit-builder-ubuntu2204-sandbox-x86_64" - memory: 24000 prefix: "csit-builder-ubuntu2204-sandbox-x86_64" hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml index 33a3349d1..b0f1ae370 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/defaults.yaml @@ -8,8 +8,8 @@ templates: operand: "=" rtarget: "builder" datacenters: "yul1" - cpu: 6000 - memory: 10000 + cpu: 24000 + memory: 24000 disk: 3000 priority: 50 idleTerminationInMinutes: 10 -- cgit 1.2.3-korg