diff options
6 files changed, 64 insertions, 4 deletions
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 new file mode 100644 index 000000000..11cab4840 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-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: 4000 + memory: 4096 + labels: "s-builder-ubuntu2204-prod-aarch64" + prefix: "s-builder-ubuntu2204-prod-aarch64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" 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 new file mode 100644 index 000000000..352e4e7a0 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-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: 4000 + memory: 4096 + labels: "s-builder-ubuntu2204-prod-x86_64" + prefix: "s-builder-ubuntu2204-prod-x86_64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" 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 new file mode 100644 index 000000000..8787e7ef4 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-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: 4000 + memory: 4096 + labels: "s-builder-ubuntu2204-sandbox-aarch64" + prefix: "s-builder-ubuntu2204-sandbox-aarch64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" 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 new file mode 100644 index 000000000..adc707877 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-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: 4000 + memory: 4096 + labels: "s-builder-ubuntu2204-sandbox-x86_64" + prefix: "s-builder-ubuntu2204-sandbox-x86_64" + hostVolumes: "/tmp/ccache.ubuntu2204:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro" diff --git a/jjb/csit/csit-terraform.yaml b/jjb/csit/csit-terraform.yaml index debddc60c..de5998e38 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: 'builder-{os}-prod-{executor-arch}' + node: 's-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: 'builder-{os}-prod-{executor-arch}' + node: 's-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 7e7ed66ab..e2a3b015e 100644 --- a/jjb/csit/csit-tox.yaml +++ b/jjb/csit/csit-tox.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -34,7 +34,7 @@ name: 'csit-verify-tox-{stream}-{os}-{executor-arch}' project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' + node: 's-builder-{os}-prod-{executor-arch}' concurrent: true latest-only: false |