Clean up CSIT images

[releng/builder.git] / jjb / defaults.yaml

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 86d1d1441084a573ad1a8aea449aa4357c1e2428..86d7cceff2b28d3611db4379f79fa2cfdcffbadc 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -91,10 +91,23 @@
     # Elasticsearch attribute
     elasticsearch-attribute: "disabled"
 
-    # CSIT images configuration
-    openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20210401-010130.589
-    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200813-042753.841
-    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207
+    # CSIT configuration
+    odl_system_count: 1
+    odl_system_flavor: "v3-standard-4"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
+    controller-max-mem: "2048m"
+    openstack_system_count: 1
+    openstack_system_flavor: "v3-standard-4"
+    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
+    openstack_system2_count: 0
+    openstack_system2_flavor: "v3-standard-2"
+    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
+    tools_system_count: 1
+    tools_system_flavor: "v3-standard-2"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210329-150700.140"
+    openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20210401-010130.589"
+    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200813-042753.841"
+    openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207"
 
     # Default Robot framework options
     robot-options: ""