From 4624ac41439c00a1403da635580f12de2c527deb Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 27 Mar 2023 08:15:24 +0000 Subject: feat(core): Introduce M class executor - Add medium resource footprint executor. - Suitable for various jobs to save resources. Signed-off-by: Peter Mikus Change-Id: Ia356c0bfe0864643ca836b4d214929eec534ebb4 --- .../m-builder-ubuntu2204-prod-aarch64.yaml | 15 ++++ .../m-builder-ubuntu2204-prod-x86_64.yaml | 15 ++++ .../m-builder-ubuntu2204-sandbox-aarch64.yaml | 15 ++++ .../m-builder-ubuntu2204-sandbox-x86_64.yaml | 15 ++++ jjb/csit/csit-perf.yaml | 90 ++++------------------ 5 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml create mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml create mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml create mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml 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 new file mode 100644 index 000000000..8d25c3af5 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml @@ -0,0 +1,15 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "arm64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "builder" + image: "fdiotools/builder-ubuntu2204:prod-aarch64" + cpu: 8000 + memory: 8192 + labels: "m-builder-ubuntu2204-prod-aarch64" + prefix: "m-builder-ubuntu2204-prod-aarch64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml new file mode 100644 index 000000000..160119fa2 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml @@ -0,0 +1,15 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "amd64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "builder" + image: "fdiotools/builder-ubuntu2204:prod-x86_64" + cpu: 8000 + memory: 8192 + labels: "m-builder-ubuntu2204-prod-x86_64" + prefix: "m-builder-ubuntu2204-prod-x86_64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml new file mode 100644 index 000000000..0137b27ac --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml @@ -0,0 +1,15 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "arm64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "builder" + image: "fdiotools/builder-ubuntu2204:sandbox-aarch64" + cpu: 8000 + memory: 8192 + labels: "m-builder-ubuntu2204-sandbox-aarch64" + prefix: "m-builder-ubuntu2204-sandbox-aarch64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml new file mode 100644 index 000000000..c73c5aa7c --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml @@ -0,0 +1,15 @@ +--- +templates: + - constraints: + - ltarget: "^${attr.cpu.arch}" + operand: "=" + rtarget: "amd64" + - ltarget: "^${node.class}" + operand: "=" + rtarget: "builder" + image: "fdiotools/builder-ubuntu2204:sandbox-x86_64" + cpu: 8000 + memory: 8192 + labels: "m-builder-ubuntu2204-sandbox-x86_64" + prefix: "m-builder-ubuntu2204-sandbox-x86_64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index 70187015e..bf892d9e6 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -398,10 +398,6 @@
  • trigger: keyword in comment to csit patch: csit-{node-arch}-perftest tag_list -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected using trigger keyword followed by tags @@ -430,7 +426,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false @@ -493,10 +489,6 @@
    • check vpp perf mrr daily
    -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • all CSIT VPP MRR perf suites @@ -510,7 +502,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: false latest-only: false @@ -558,10 +550,6 @@
    • check vpp perf hoststack daily
    -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • all CSIT VPP HOSTSTACK perf suites @@ -575,7 +563,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: false latest-only: false @@ -623,10 +611,6 @@
    • check vpp perf mrr weekly on {node-arch}
    -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • NF Density CSIT VPP MRR perf suites @@ -640,7 +624,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: false latest-only: false @@ -688,10 +672,6 @@
    • check vpp perf ndrpdr weekly on {node-arch}
    -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • pre-selected CSIT VPP NDRPDR perf suites @@ -704,7 +684,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: false latest-only: false @@ -748,10 +728,6 @@
    • check trex perf ndrpdr weekly on {node-arch}
    -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • pre-selected CSIT TREX NDRPDR perf suites @@ -764,7 +740,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: false latest-only: false @@ -814,10 +790,6 @@
  • trigger: keyword in comment to csit patch: csit-trex-{node-arch}-perftest tag_list -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected using trigger keyword followed by tags @@ -838,7 +810,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false @@ -903,10 +875,6 @@
  • trigger: keyword in comment to csit patch: csit-dpdk-{node-arch}-perftest tag_list -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected using trigger keyword followed by tags @@ -930,7 +898,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false @@ -988,10 +956,6 @@
    • check dpdk perf mrr weekly
    -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • all CSIT DPDK MRR perf suites @@ -1005,7 +969,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: false latest-only: false @@ -1064,10 +1028,6 @@
  • trigger example: csit-vpp-report-iter-{node-arch}-perftest vpp-00 -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected by tags defined in @@ -1084,7 +1044,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false @@ -1153,10 +1113,6 @@
  • trigger example: csit-dpdk-report-iter-{node-arch}-perftest dpdk-00 -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected by tags defined in @@ -1173,7 +1129,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false @@ -1242,10 +1198,6 @@
  • trigger example: csit-trex-report-iter-{node-arch}-perftest trex-00 -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected by tags defined in @@ -1262,7 +1214,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false @@ -1331,10 +1283,6 @@
  • trigger example: csit-vpp-report-cov-{node-arch}-perftest ip4-00 -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected by tags defined in @@ -1351,7 +1299,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false @@ -1420,10 +1368,6 @@
  • trigger example: csit-dpdk-report-cov-{node-arch}-perftest dpdk-00 -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected by tags defined in @@ -1440,7 +1384,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false @@ -1509,10 +1453,6 @@
  • trigger example: csit-trex-report-cov-{node-arch}-perftest trex-00 -
  • executor -
      -
    • builder-{os}-prod-{executor-arch} -
  • perf test-cases selection
    • test-cases selected by tags defined in @@ -1529,7 +1469,7 @@
    project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 'm-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false -- cgit 1.2.3-korg