From c74508261cdc676f8ee2e14e75bc6f5cf16697c0 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Sun, 4 Apr 2021 13:25:26 -0700 Subject: [PATCH] Clean up CSIT images - Only use 2 Ubuntu images - Consilidate CSIT variables in defaults.yaml - Remove OFP bundle test (not working for long time) Change-Id: I0b9f5fe46ecea95ab6b267a20d16bd2ff9f3cdb0 Signed-off-by: Luis Gomez --- jjb/defaults.yaml | 21 +++++-- jjb/integration/integration-templates.yaml | 60 ------------------- jjb/netconf/netconf-csit-callhome.yaml | 2 +- .../netvirt-csit-hwvtep-openstack.yaml | 3 - ...ugin-csit-bundle-based-reconciliation.yaml | 32 ---------- .../openflowplugin-csit-cbench.yaml | 3 - ...flowplugin-csit-clustering-bulkomatic.yaml | 3 - ...lugin-csit-clustering-perf-bulkomatic.yaml | 3 - .../openflowplugin-csit-clustering.yaml | 3 - .../openflowplugin-csit-flow-services.yaml | 3 - .../openflowplugin-csit-longevity.yaml | 3 - .../openflowplugin-csit-perf-bulkomatic.yaml | 3 - ...flowplugin-csit-perf-stats-collection.yaml | 4 -- .../openflowplugin-csit-sanity.yaml | 3 - .../openflowplugin-csit-scale-link.yaml | 3 - .../openflowplugin-csit-scale-switch.yaml | 3 - .../openflowplugin-csit-scale.yaml | 3 - 17 files changed, 18 insertions(+), 137 deletions(-) delete mode 100644 jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 86d1d14410..86d7cceff2 100644 --- 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 91e05fce30..662bf7fa6a 100644 --- 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 4896fcf8d4..da070bb208 100644 --- 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 499fe826ec..08f38032d4 100644 --- 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 index 638377d815..0000000000 --- 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 4ab1ba2cf6..392846bccc 100644 --- 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 bd55d1b628..a66083d135 100644 --- 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 8162bea49e..21ff1794a6 100644 --- 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 8cc7e99e89..8bc0098165 100644 --- 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 ae9e3cf8fe..ecb5d8c3be 100644 --- 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 ecf1013872..3f0b4e17dc 100644 --- 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 7e181e6866..2918f17b24 100644 --- 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 fc72ecab17..58a20d294c 100644 --- 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 d88cad107f..f68de4c617 100644 --- 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 7a112bf964..02817a04c5 100644 --- 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 2c34ba4daa..d4baa939dd 100644 --- 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 76b448d0cb..992d6750fa 100644 --- 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, -- 2.36.6