diff options
39 files changed, 132 insertions, 202 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 d15a462a..c6134f26 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 8e2293a5..81d49e40 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-debian10-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml deleted file mode 100644 index d49a0ba2..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-test-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "fdiotools/builder-debian10:test-x86_64" - labels: "builder-debian10-test-x86_64" - memory: 14000 - prefix: "builder-debian10-test-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 fd4b88e4..701e78f9 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 62fbe833..fceac024 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-debian11-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-test-x86_64.yaml deleted file mode 100644 index 42bc5905..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-test-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "fdiotools/builder-debian11:test-x86_64" - labels: "builder-debian11-test-x86_64" - memory: 14000 - prefix: "builder-debian11-test-x86_64" - hostVolumes: "/tmp/ccache.debian11:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml deleted file mode 100644 index 60bee47b..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-aarch64.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-ubuntu1804:prod-aarch64" - labels: "builder-ubuntu1804-prod-aarch64" - prefix: "builder-ubuntu1804-prod-aarch64" - hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml deleted file mode 100644 index 8bde8f37..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-prod-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "fdiotools/builder-ubuntu1804:prod-x86_64" - labels: "builder-ubuntu1804-prod-x86_64" - memory: 14000 - prefix: "builder-ubuntu1804-prod-x86_64" - hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml deleted file mode 100644 index af7f2c27..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-ubuntu1804:sandbox-aarch64" - labels: "builder-ubuntu1804-sandbox-aarch64" - prefix: "builder-ubuntu1804-sandbox-aarch64" - hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml deleted file mode 100644 index 58c86ce5..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "fdiotools/builder-ubuntu1804:sandbox-x86_64" - labels: "builder-ubuntu1804-sandbox-x86_64" - memory: 14000 - prefix: "builder-ubuntu1804-sandbox-x86_64" - hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml deleted file mode 100644 index a1b9011f..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-aarch64.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-ubuntu1804:test-aarch64" - labels: "builder-ubuntu1804-test-aarch64" - prefix: "builder-ubuntu1804-test-aarch64" - hostVolumes: "/tmp/ccache.ubuntu1804:/scratch/ccache" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml deleted file mode 100644 index c3ff4524..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-test-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "fdiotools/builder-ubuntu1804:test-x86_64" - labels: "builder-ubuntu1804-test-x86_64" - memory: 14000 - prefix: "builder-ubuntu1804-test-x86_64" - hostVolumes: "/tmp/ccache.ubuntu1804:/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 cdb22abf..7d4c78d9 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 11305584..90208365 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 11f7c388..bfc87f2b 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 b218c615..9910fdd0 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-ubuntu2004-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml deleted file mode 100644 index a07af004..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-ubuntu2004:test-aarch64" - labels: "builder-ubuntu2004-test-aarch64" - prefix: "builder-ubuntu2004-test-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" - memory: 16000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml deleted file mode 100644 index 58f661c8..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "fdiotools/builder-ubuntu2004:test-x86_64" - labels: "builder-ubuntu2004-test-x86_64" - memory: 14000 - prefix: "builder-ubuntu2004-test-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 c4f8c378..b4377e91 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 529a0bee..1170d2cc 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 69f78231..66a86316 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 f9a7ce2c..3a70830b 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/builder-ubuntu2204-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-aarch64.yaml deleted file mode 100644 index 5b73277c..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-aarch64.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -templates: - - image: "fdiotools/builder-ubuntu2204:test-aarch64" - labels: "builder-ubuntu2204-test-aarch64" - prefix: "builder-ubuntu2204-test-aarch64" - hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache" - memory: 16000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-x86_64.yaml deleted file mode 100644 index d798c160..00000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-test-x86_64.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "fdiotools/builder-ubuntu2204:test-x86_64" - labels: "builder-ubuntu2204-test-x86_64" - memory: 14000 - prefix: "builder-ubuntu2204-test-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 3d9a5519..80a90937 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 1a903900..e172415d 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 ce79143e..d2f50776 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 1f0249b8..a68b2f1e 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 95f586e2..4b43d6b7 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 79dbd2c8..07e4bbcf 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 36d6ae83..0f3d12bd 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 847ff65a..1109b8cc 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 33a3349d..b0f1ae37 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 diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index e0887571..ad10825b 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -49,6 +49,14 @@ description: "The OS on which 'make test' is run." - parameter: + name: make-test-multiworker-os-parameter + parameters: + - string: + name: MAKE_TEST_MULTIWORKER_OS + default: '{make-test-multiworker-os}' + description: "The OS on which 'make test' is run with multiple VPP workers." + +- parameter: name: csit-fail-on-crc-mismatch-parameter parameters: - string: diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh index a06bbf96..3ee4748d 100644 --- a/jjb/scripts/vpp/build.sh +++ b/jjb/scripts/vpp/build.sh @@ -33,8 +33,8 @@ DRYRUN="${DRYRUN:-}" IS_CSIT_VPP_JOB="${IS_CSIT_VPP_JOB:-}" MAKE_PARALLEL_FLAGS="${MAKE_PARALLEL_FLAGS:-}" MAKE_PARALLEL_JOBS="${MAKE_PARALLEL_JOBS:-}" -MAKE_TEST_OS="${MAKE_TEST_OS:-ubuntu-18.04}" -MAKE_TEST_MULTIWORKER_OS="${MAKE_TEST_MULTIWORKER_OS:-debian-10}" +MAKE_TEST_OS="${MAKE_TEST_OS:-ubuntu-22.04}" +MAKE_TEST_MULTIWORKER_OS="${MAKE_TEST_MULTIWORKER_OS:-debian-11}" VPPAPIGEN_TEST_OS="${VPPAPIGEN_TEST_OS:-${MAKE_TEST_OS}}" BUILD_RESULT="SUCCESSFULLY COMPLETED" BUILD_ERROR="" @@ -76,10 +76,10 @@ make_build_test() { return fi if [ -n "${MAKE_PARALLEL_JOBS}" ] ; then - export TEST_JOBS="${MAKE_PARALLEL_JOBS}" + TEST_JOBS="${MAKE_PARALLEL_JOBS}" echo "Testing VPP with ${TEST_JOBS} cores." else - export TEST_JOBS="auto" + TEST_JOBS="auto" echo "Testing VPP with automatically calculated number of cores. " \ "See test logs for the exact number." fi @@ -90,26 +90,35 @@ make_build_test() { fi fi if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_OS}" ] ; then - if ! make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test ; then + if ! make COMPRESS_FAILED_TEST_LOGS=yes TEST_JOBS="$TEST_JOBS" RETRIES=3 test ; then BUILD_ERROR="FAILED 'make test'" return fi else echo "Skip running 'make test' on ${OS_ID}-${OS_VERSION_ID}" fi - if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_MULTIWORKER_OS}" ] \ - && git grep -q VPP_WORKER_CONFIG ; then - if ! make VPP_WORKER_CONFIG="workers 2" COMPRESS_FAILED_TEST_LOGS=yes \ - RETRIES=3 test ; then - BUILD_ERROR="FAILED 'make test' with VPP_WORKER_CONFIG='workers 2'" - return + if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_MULTIWORKER_OS}" ] ; then + if git grep -q VPP_WORKER_CONFIG ; then + if ! make VPP_WORKER_CONFIG="workers 2" COMPRESS_FAILED_TEST_LOGS=yes \ + RETRIES=3 TEST_JOBS="$TEST_JOBS" test ; then + BUILD_ERROR="FAILED 'make test' with VPP_WORKER_CONFIG='workers 2'" + return + else + echo -e "\n* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^}" \ + "MULTIWORKER MAKE TEST SUCCESSFULLY COMPLETED\n" + fi + elif git grep -q VPP_WORKER_COUNT ; then + if ! make VPP_WORKER_COUNT="2" COMPRESS_FAILED_TEST_LOGS=yes \ + RETRIES=3 TEST_JOBS="$TEST_JOBS" test ; then + BUILD_ERROR="FAILED 'make test' with VPP_WORKER_CONFIG='workers 2'" + return + else + echo -e "\n* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^}" \ + "MULTIWORKER MAKE TEST SUCCESSFULLY COMPLETED\n" + fi else - echo -e "\n* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^}" \ - "MULTIWORKER MAKE TEST SUCCESSFULLY COMPLETED\n" + echo "Skip running MULTIWORKER MAKE TEST on ${OS_ID}-${OS_VERSION_ID}" fi - else - echo "Skip running 'make test' with VPP_WORKER_CONFIG='workers 2'" \ - "on ${OS_ID}-${OS_VERSION_ID}" fi } diff --git a/jjb/scripts/vpp/debug-build.sh b/jjb/scripts/vpp/debug-build.sh index 414a8116..ea742fb2 100644 --- a/jjb/scripts/vpp/debug-build.sh +++ b/jjb/scripts/vpp/debug-build.sh @@ -22,6 +22,7 @@ OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g') OS_ARCH=$(uname -m) DRYRUN="${DRYRUN:-}" +MAKE_PARALLEL_JOBS="${MAKE_PARALLEL_JOBS:-}" BUILD_RESULT="SUCCESSFULLY COMPLETED" BUILD_ERROR="" RETVAL="0" @@ -47,9 +48,21 @@ make_build_test_debug() { BUILD_ERROR="FAILED 'make build'" return fi - if ! make UNATTENDED=yes TEST_JOBS=auto test-debug ; then - BUILD_ERROR="FAILED 'make test-debug'" - return + if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_OS}" ] ; then + if [ -n "${MAKE_PARALLEL_JOBS}" ] ; then + TEST_JOBS="${MAKE_PARALLEL_JOBS}" + echo "Testing VPP with ${TEST_JOBS} cores." + else + TEST_JOBS="auto" + echo "Testing VPP with automatically calculated number of cores. " \ + "See test logs for the exact number." + fi + if ! make UNATTENDED=yes TEST_JOBS="$TEST_JOBS" test-debug ; then + BUILD_ERROR="FAILED 'make UNATTENDED=yes TEST_JOBS=$TEST_JOBS test-debug'" + return + fi + else + echo "Skip running 'make test-debug' on ${OS_ID}-${OS_VERSION_ID}" fi } diff --git a/jjb/scripts/vpp/gcc-build.sh b/jjb/scripts/vpp/gcc-build.sh index 5afe739d..48877457 100644 --- a/jjb/scripts/vpp/gcc-build.sh +++ b/jjb/scripts/vpp/gcc-build.sh @@ -47,16 +47,24 @@ make_build_release_build_test_gcov_sanity() { BUILD_ERROR="FAILED 'make build'" return fi + if [ -n "${MAKE_PARALLEL_JOBS}" ] ; then + TEST_JOBS="${MAKE_PARALLEL_JOBS}" + echo "Testing VPP with ${TEST_JOBS} cores." + else + TEST_JOBS="auto" + echo "Testing VPP with automatically calculated number of cores. " \ + "See test logs for the exact number." + fi # TODO: Add 'smoke test' env var to select smoke test cases # then update this accordingly. For now pick a few basic suites... MAKE_TEST_SUITES="vlib vppinfra vpe_api vapi cli bihash" for suite in $MAKE_TEST_SUITES ; do - if ! make UNATTENDED=yes GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test ; then - BUILD_ERROR="FAILED 'make GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test'!" + if ! make UNATTENDED=yes TESTS_GCOV=1 TEST_JOBS="$TEST_JOBS" TEST=$suite test ; then + BUILD_ERROR="FAILED 'make TESTS_GCOV=1 TEST_JOBS=$TEST_JOBS TEST=$suite test'!" return fi - if ! make UNATTENDED=yes GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test-debug ; then - BUILD_ERROR="FAILED 'make GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test-debug'!" + if ! make UNATTENDED=yes TESTS_GCOV=1 TEST_JOBS="$TEST_JOBS" TEST=$suite test-debug ; then + BUILD_ERROR="FAILED 'make TESTS_GCOV=1 TEST_JOBS=$TEST_JOBS TEST=$suite test-debug'!" return fi done diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 015eaf84..deb22144 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -20,8 +20,14 @@ - '2206': branch: 'stable/2206' branch-refspec: '' + - '2210': + branch: 'stable/2210' + branch-refspec: '' exclude: - # os deprecated in master (22.10) + # os deprecated in 22.10 + - stream: '2210' + os: 'ubuntu2004' + # os deprecated in master - stream: 'master' os: 'ubuntu2004' # os added in 22.10 diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 24e6e89d..f355ca6d 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -46,9 +46,15 @@ - '2206': branch: 'stable/2206' branch-refspec: '' + - '2210': + branch: 'stable/2210' + branch-refspec: '' executor-arch: 'x86_64' exclude: - # os deprecated in master (22.10) + # os deprecated in 22.10 + - stream: '2210' + os: 'ubuntu2004' + # os deprecated in master - stream: 'master' os: 'ubuntu2004' # os added in 22.10 @@ -75,17 +81,27 @@ - 'vpp-merge-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '4' - make-test-os: 'ubuntu-20.04' stream: - 'master': branch: 'master' branch-refspec: '' + make-test-os: 'ubuntu-22.04' + make-test-multiworker-os: 'debian-11' - '2202': branch: 'stable/2202' branch-refspec: '' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: 'debian-11' - '2206': branch: 'stable/2206' branch-refspec: '' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: 'debian-11' + - '2210': + branch: 'stable/2210' + branch-refspec: '' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: 'debian-11' os: - debian10 - debian11 @@ -93,6 +109,15 @@ - ubuntu2204 executor-arch: 'x86_64' exclude: + # os deprecated in 22.06 + - stream: '2206' + os: 'debian10' + # os deprecated in 22.10 + - stream: '2210' + os: 'debian10' + # os deprecated in master + - stream: 'master' + os: 'debian10' # os added in 22.06 - stream: '2202' os: 'debian11' @@ -116,7 +141,7 @@ - 'vpp-debug-verify-{stream}-{os}-{executor-arch}' project: 'vpp' make-parallel-jobs: '4' - make-test-os: 'ubuntu-20.04' + make-test-os: 'ubuntu-22.04' comment-trigger-value: 'debug-verify' stream: - 'master': @@ -135,6 +160,7 @@ jobs: - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}' project: 'vpp' + make-parallel-jobs: '4' os: - ubuntu2004 - ubuntu2204 @@ -149,8 +175,14 @@ - '2206': branch: 'stable/2206' branch-refspec: '' + - '2210': + branch: 'stable/2210' + branch-refspec: '' exclude: - # os deprecated in master (22.10) + # os deprecated in 22.10 + - stream: '2210' + os: 'ubuntu2004' + # os deprecated in master - stream: 'master' os: 'ubuntu2004' # os added in 22.10 @@ -176,18 +208,28 @@ - 'vpp-verify-{stream}-{os}-{executor-arch}' - 'vpp-merge-{stream}-{os}-{executor-arch}' project: 'vpp' - make-parallel-jobs: '16' - make-test-os: 'ubuntu-20.04' + make-parallel-jobs: '4' stream: - 'master': branch: 'master' branch-refspec: '' + make-test-os: 'ubuntu-22.04' + make-test-multiworker-os: '' - '2202': branch: 'stable/2202' branch-refspec: '' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: '' - '2206': branch: 'stable/2206' branch-refspec: '' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: '' + - '2210': + branch: 'stable/2210' + branch-refspec: '' + make-test-os: 'ubuntu-20.04' + make-test-multiworker-os: '' os: - ubuntu2004 - ubuntu2204 @@ -213,6 +255,9 @@ - 'master': branch: 'master' branch-refspec: '' + - '2210': + branch: 'stable/2210' + branch-refspec: '' testbed-arch: - 1n-skx: os: 'ubuntu2204' @@ -291,11 +336,17 @@ - '2206': branch: 'stable/2206' branch-refspec: '' + - '2210': + branch: 'stable/2210' + branch-refspec: '' os: - 'ubuntu2004' - 'ubuntu2204' exclude: - # os deprecated in master (22.10) + # os deprecated in 22.10 + - stream: '2210' + os: 'ubuntu2004' + # os deprecated in master - stream: 'master' os: 'ubuntu2004' # os added in 22.10 @@ -463,6 +514,8 @@ make-parallel-jobs: '{make-parallel-jobs}' - make-test-os-parameter: make-test-os: '{make-test-os}' + - make-test-multiworker-os-parameter: + make-test-multiworker-os: '{make-test-multiworker-os}' - os-parameter: os: '{os}' - project-parameter: @@ -586,6 +639,8 @@ make-parallel-jobs: '{make-parallel-jobs}' - make-test-os-parameter: make-test-os: '{make-test-os}' + - make-test-multiworker-os-parameter: + make-test-multiworker-os: '{make-test-multiworker-os}' - os-parameter: os: '{os}' - project-parameter: |