CSIT: Prepare Ubuntu2004 vpp device templates

+ Nomad templates

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I4f1a0d2e7b44ab13ec6822116fee27053532c7ee

11 files changed, 27 insertions, 101 deletions

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml
index e45c768f..3d9a5519 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-aarch64.yaml
@@ -7,6 +7,7 @@ templates:
       - ltarget: "^${node.class}"
         operand: "="
         rtarget: "csitarm"
-    image: "fdiotools/csit_dut-ubuntu1804:prod-aarch64"
-    labels: "csit_dut-ubuntu1804-prod-aarch64"
-    prefix: "csit_dut-ubuntu1804-prod-aarch64"
+    image: "fdiotools/builder-ubuntu2004:prod-aarch64"
+    labels: "csit-builder-ubuntu2004-prod-aarch64"
+    memory: 14000
+    prefix: "csit-builder-ubuntu2004-prod-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml
index 7730c8f8..1a903900 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-prod-x86_64.yaml
@@ -7,8 +7,8 @@ templates:
       - ltarget: "^${node.class}"
         operand: "="
         rtarget: "csit"
-    cpu: 10000
-    image: "fdiotools/csit_shim-ubuntu1804:prod-x86_64"
-    labels: "csit_shim-ubuntu1804-prod-x86_64"
-    memory: 18000
-    prefix: "csit_shim-ubuntu1804-prod-x86_64"
+    cpu: 15000
+    image: "fdiotools/builder-ubuntu2004:prod-x86_64"
+    labels: "csit-builder-ubuntu2004-prod-x86_64"
+    memory: 16000
+    prefix: "csit-builder-ubuntu2004-prod-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml
index e86a8bb7..ce79143e 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-aarch64.yaml
@@ -7,6 +7,7 @@ templates:
       - ltarget: "^${node.class}"
         operand: "="
         rtarget: "csitarm"
-    image: "fdiotools/csit_shim-ubuntu1804:prod-aarch64"
-    labels: "csit_shim-ubuntu1804-prod-aarch64"
-    prefix: "csit_shim-ubuntu1804-prod-aarch64"
+    image: "fdiotools/builder-ubuntu2004:sandbox-aarch64"
+    labels: "csit-builder-ubuntu2004-sandbox-aarch64"
+    memory: 14000
+    prefix: "csit-builder-ubuntu2004-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml
new file mode 100644
index 00000000..1f0249b8
--- /dev/null
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2004-sandbox-x86_64.yaml
@@ -0,0 +1,14 @@
+---
+templates:
+  - constraints:
+      - ltarget: "^${attr.cpu.arch}"
+        operand: "="
+        rtarget: "amd64"
+      - ltarget: "^${node.class}"
+        operand: "="
+        rtarget: "csit"
+    cpu: 15000
+    image: "fdiotools/builder-ubuntu2004:sandbox-x86_64"
+    labels: "csit-builder-ubuntu2004-sandbox-x86_64"
+    memory: 16000
+    prefix: "csit-builder-ubuntu2004-sandbox-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-prod-x86_64.yaml
deleted file mode 100644
index 9196f270..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-prod-x86_64.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-templates:
-  - constraints:
-      - ltarget: "^${attr.cpu.arch}"
-        operand: "="
-        rtarget: "amd64"
-      - ltarget: "^${node.class}"
-        operand: "="
-        rtarget: "csit"
-    cpu: 10000
-    image: "fdiotools/csit_dut-ubuntu1804:prod-x86_64"
-    labels: "csit_dut-ubuntu1804-prod-x86_64"
-    memory: 18000
-    prefix: "csit_dut-ubuntu1804-prod-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-sandbox-aarch64.yaml
deleted file mode 100644
index 57437582..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-sandbox-aarch64.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-templates:
-  - constraints:
-      - ltarget: "^${attr.cpu.arch}"
-        operand: "="
-        rtarget: "arm64"
-      - ltarget: "^${node.class}"
-        operand: "="
-        rtarget: "csitarm"
-    image: "fdiotools/csit_dut-ubuntu1804:sandbox-aarch64"
-    labels: "csit_dut-ubuntu1804-sandbox-aarch64"
-    prefix: "csit_dut-ubuntu1804-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-sandbox-x86_64.yaml
deleted file mode 100644
index 93297357..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-templates:
-  - constraints:
-      - ltarget: "^${attr.cpu.arch}"
-        operand: "="
-        rtarget: "amd64"
-      - ltarget: "^${node.class}"
-        operand: "="
-        rtarget: "csit"
-    cpu: 10000
-    image: "fdiotools/csit_dut-ubuntu1804:sandbox-x86_64"
-    labels: "csit_dut-ubuntu1804-sandbox-x86_64"
-    memory: 18000
-    prefix: "csit_dut-ubuntu1804-sandbox-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-test-aarch64.yaml
deleted file mode 100644
index 12137e60..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_dut-ubuntu1804-test-aarch64.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-templates:
-  - constraints:
-      - ltarget: "^${attr.cpu.arch}"
-        operand: "="
-        rtarget: "arm64"
-      - ltarget: "^${node.class}"
-        operand: "="
-        rtarget: "csitarm"
-    image: "fdiotools/csit_dut-ubuntu1804:test-aarch64"
-    labels: "csit_dut-ubuntu1804-test-aarch64"
-    prefix: "csit_dut-ubuntu1804-test-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-sandbox-aarch64.yaml
deleted file mode 100644
index 5dc33b6b..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-sandbox-aarch64.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-templates:
-  - constraints:
-      - ltarget: "^${attr.cpu.arch}"
-        operand: "="
-        rtarget: "arm64"
-      - ltarget: "^${node.class}"
-        operand: "="
-        rtarget: "csitarm"
-    image: "fdiotools/csit_shim-ubuntu1804:sandbox-aarch64"
-    labels: "csit_shim-ubuntu1804-sandbox-aarch64"
-    prefix: "csit_shim-ubuntu1804-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-sandbox-x86_64.yaml
deleted file mode 100644
index 5adf5f04..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-templates:
-  - constraints:
-      - ltarget: "^${attr.cpu.arch}"
-        operand: "="
-        rtarget: "amd64"
-      - ltarget: "^${node.class}"
-        operand: "="
-        rtarget: "csit"
-    cpu: 10000
-    image: "fdiotools/csit_shim-ubuntu1804:sandbox-x86_64"
-    labels: "csit_shim-ubuntu1804-sandbox-x86_64"
-    memory: 18000
-    prefix: "csit_shim-ubuntu1804-sandbox-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-test-aarch64.yaml
deleted file mode 100644
index 778c534f..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit_shim-ubuntu1804-test-aarch64.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-templates:
-  - constraints:
-      - ltarget: "^${attr.cpu.arch}"
-        operand: "="
-        rtarget: "arm64"
-      - ltarget: "^${node.class}"
-        operand: "="
-        rtarget: "csitarm"
-    image: "fdiotools/csit_shim-ubuntu1804:test-aarch64"
-    labels: "csit_shim-ubuntu1804-test-aarch64"
-    prefix: "csit_shim-ubuntu1804-test-aarch64"