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

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 938dc0d..3be0f2b 100644 (file)
--- 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 (file)
index 0000000..b40b58e
--- /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"