Clean up CSIT images

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 91e05fce3078d34f926e0809209f506a3acc8188..662bf7fa6a4c3f02f5d010f18563c2a895aae919 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -76,13 +76,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -184,13 +177,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -492,13 +478,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job Configuration #
     #####################
@@ -603,13 +582,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -911,10 +883,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    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"
     docker_system_count: "1"
     docker_system_flavor: "v3-standard-2"
     docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955"
@@ -1045,20 +1013,6 @@
     openstack-heat-template: csit-4-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    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 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -1475,20 +1429,6 @@
     openstack-heat-template: csit-4-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    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 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################