diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2021-03-22 16:01:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-03-22 16:01:02 +0000 |
| commit | 3b67425f451211dc49e63713c7d00184903f683c (patch) | |
| tree | 208c5966ef546d8de2256f4b706958cccd56ec29 /jenkins-config/clouds | |
| parent | 0136da587f46e3b02fb012cb4026d2acfd7be4de (diff) | |
| parent | 9c1c24fbbc9ed8ad13e3a590e4d2242bf1cffd5e (diff) | |
Merge "Use Ubuntu-20.04 for vpp-csit-* job executor images"
Diffstat (limited to 'jenkins-config/clouds')
7 files changed, 0 insertions, 72 deletions
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-l.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-l.yaml deleted file mode 100644 index 747f61ad9..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-l.yaml +++ /dev/null @@ -1,13 +0,0 @@ -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 20000 - image: "snergster/vpp-ubuntu18" - labels: "ubuntu1804-l" - memory: 32000 - prefix: "prod-amd" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml deleted file mode 100644 index b40b58e63..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml +++ /dev/null @@ -1,13 +0,0 @@ -templates: - - constraints: - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - - ltarget: "^${node.class}" - operand: "=" - rtarget: "builder" - cpu: 14000 - image: "snergster/vpp-ubuntu18" - labels: "ubuntu1804-us" - memory: 14000 - prefix: "prod-amd" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-s.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-s.yaml deleted file mode 100644 index 5f3afcc05..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-s.yaml +++ /dev/null @@ -1,5 +0,0 @@ -templates: - - image: "snergster/vpp-arm-ubuntu18" - labels: "ubuntu1804arm-s" - memory: 16000 - prefix: "prod-arm" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-us.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-us.yaml deleted file mode 100644 index f898934a6..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804arm-us.yaml +++ /dev/null @@ -1,4 +0,0 @@ -templates: - - image: "snergster/vpp-arm-ubuntu18" - labels: "ubuntu1804arm-us" - prefix: "prod-arm" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-arm-ubuntu18.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-arm-ubuntu18.yaml deleted file mode 100644 index 9ab4631a4..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-arm-ubuntu18.yaml +++ /dev/null @@ -1,11 +0,0 @@ -templates: - - constraints: - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csitarm" - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "arm64" - image: "snergster/vpp-arm-ubuntu18" - labels: "vpp-csit-arm-ubuntu18" - prefix: "prod-csit-arm" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-device.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-device.yaml deleted file mode 100644 index ef4f9eda7..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-device.yaml +++ /dev/null @@ -1,13 +0,0 @@ -templates: - - constraints: - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csit" - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - cpu: 10000 - image: "snergster/vpp-ubuntu18" - labels: "vpp-csit-device vpp-csit-ubuntu18" - memory: 18000 - prefix: "prod-csit" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-ubuntu18.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-ubuntu18.yaml deleted file mode 100644 index ef4f9eda7..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/vpp-csit-ubuntu18.yaml +++ /dev/null @@ -1,13 +0,0 @@ -templates: - - constraints: - - ltarget: "^${node.class}" - operand: "=" - rtarget: "csit" - - ltarget: "^${attr.cpu.arch}" - operand: "=" - rtarget: "amd64" - cpu: 10000 - image: "snergster/vpp-ubuntu18" - labels: "vpp-csit-device vpp-csit-ubuntu18" - memory: 18000 - prefix: "prod-csit" |