Merge "Clean up CSIT images"

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: ""

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 #
     #####################

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 4896fcf8d4dfc3afbe7ee36012159c179a616831..da070bb208b9a1f8944f1e10d14f89bec6def784 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -29,7 +29,7 @@
           scope: "only"
 
     # no mininet required
-    tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200901-170213.055
+    tools_system_image: "ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210401-040235.479"
 
     # Features to install
     install-features: "odl-netconf-callhome-ssh,odl-restconf"

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 499fe826ecf2e9f30416c6b9a015599d1a8d14ed..08f38032d46f6c9d61ec43144d7bafb02aadefe8 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -16,7 +16,6 @@
     openstack_system_flavor: v3-standard-8
     openstack_system2_flavor: v3-standard-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200813-034124.624
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -66,7 +65,6 @@
     openstack_system_flavor: v3-standard-8
     openstack_system2_flavor: v3-standard-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200813-034124.624
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -116,7 +114,6 @@
     openstack_system_flavor: v3-standard-8
     openstack_system2_flavor: v3-standard-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200813-034124.624
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
deleted file mode 100644 (file)
index 638377d..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-bundle-based-reconciliation
-    jobs:
-      - inttest-csit-1node
-
-    project: "openflowplugin"
-
-    functionality: "bundle-based-reconciliation"
-
-    # Project branches
-    stream:
-      - phosphorus:
-          branch: "master"
-          jre: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-
-    install:
-      - all:
-          scope: "all"
-
-    # Job images
-    tools_system_count: 2
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
-    # Features to install
-    install-features: "odl-openflowplugin-flow-services-rest"

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 4ab1ba2cf6806e022d9a6fe2ae8c3e854ed77f95..392846bcccceeb91332de553d50e216dcde2ba6d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -26,9 +26,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: "odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test"
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index bd55d1b628bd7c27d423b1024bec6d174b531f60..a66083d135cff88a0f066c00128d822961ad1367 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -28,9 +28,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: "odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic"
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 8162bea49e983faaaf0b7894c34cf65907e00d75..21ff1794a63c200f76a1cdf4928ce603287d5a0b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -28,9 +28,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest,

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 8cc7e99e890c3b6913748c28dbab0e27cd3b5e7d..8bc00981657d34d3e8267e518fdd24173f353d72 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -28,9 +28,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest,

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index ae9e3cf8fe64e00c98b8615393809480bb618043..ecb5d8c3be483f4854569d1263d0108bbc22b7fe 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -27,9 +27,6 @@
           jre: "openjdk11"
           install: "all"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest,

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index ecf1013872a0bd6084afb9905b1d3f78190cc435..3f0b4e17dcae26a7a043e581fc72fe9a63ae5f08 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -30,9 +30,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest,

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 7e181e686664431acc57b37f040af7dc21f14fbe..2918f17b240e1ca8b7f0b9915b880e111a87f482 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -28,9 +28,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest,

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index fc72ecab1709957c8a14ee4cb6c4a8fb350ab244..58a20d294c68790a26113ea8619802f6ac7ed288 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -28,10 +28,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    odl_system_flavor: "v3-standard-4"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: "odl-openflowplugin-flow-services-rest"
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index d88cad107fb468714f473ad46307a1336f0beb63..f68de4c617850ba23b5fe1114d5f242f123995f5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -27,9 +27,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest,

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 7a112bf964a4c22a69c448f50e86907e2bc2758a..02817a04c5b5dcea094ac4a5ee62125924b2c89e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -26,9 +26,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest,

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 2c34ba4daa0714b2ee1d4726489025203b5ba3ec..d4baa939dde3f7295e02a5fb23e20512a80c8ef9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -26,9 +26,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 76b448d0cbc64b4007da6dcedbf43eb15c1942ad..992d6750fac6656d2616ba10a5d3cc3de5666cdc 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -28,9 +28,6 @@
       - only:
           scope: "only"
 
-    # Job images
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     # Features to install
     install-features: >
       odl-openflowplugin-flow-services-rest,