summaryrefslogtreecommitdiffstats
path: root/jenkins-config
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2021-01-13 14:09:08 -0500
committerDave Wallace <dwallacelf@gmail.com>2021-01-15 23:48:35 +0000
commit2d34bfa062a3495879b0ef8fcfd6b4448e56cbbb (patch)
tree485fe1d6622933e78fe359c3c4b1677dbff44cd7 /jenkins-config
parent216f49623140f6189850345c395be53a2a1765a4 (diff)
Add missing ubuntu1804-us label to FDIONOMAD cloud.
- also fix typo in builder-ubuntu1804-sandbox-aarch64.yaml Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Change-Id: Ibbeb312550b2bd3cce19efaf1a174146f52e13db
Diffstat (limited to 'jenkins-config')
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml13
2 files changed, 14 insertions, 1 deletions
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
index 938dc0de..3be0f2b9 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu1804-sandbox-aarch64.yaml
@@ -1,5 +1,5 @@
---
templates:
- - image: "fdiotools/builder-ubuntu1804:prod-aarch64"
+ - image: "fdiotools/builder-ubuntu1804:sandbox-aarch64"
labels: "builder-ubuntu1804-sandbox-aarch64"
prefix: "builder-ubuntu1804-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml
new file mode 100644
index 00000000..b40b58e6
--- /dev/null
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/ubuntu1804-us.yaml
@@ -0,0 +1,13 @@
+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"