Merge "Update Ubuntu 14.04 mininet images"

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 787da0fa55cc4bc879e8e218f4cd1c2e0967da5f..a558877bdc894cd094eb873630ff6447fc003299 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -58,16 +58,16 @@
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
     docker_system_flavor: 4 GB General Purpose v1
-    docker_system_image: CentOS 7 - docker - 20170120-1434
+    docker_system_image: CentOS 7 - docker - 20170609-0220
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170311-0517
+    odl_system_image: CentOS 7 - java-builder - 20170609-0259
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
-    openstack_system_image: CentOS 7 - devstack - 20170221-1719
+    openstack_system_image: CentOS 7 - devstack - 20170609-0220
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439
+    tools_system_image: Ubuntu 14.04 - mininet - 20170609-0220
 
     # Default Robot framework options
     robot-options: ''
@@ -180,8 +180,6 @@
         bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
         distribution-deploy-carbon,
         distribution-offline-carbon,
-        distribution4-deploy-carbon,
-        distribution4-offline-carbon,
         openflowplugin-csit-1node-periodic-longevity-only-carbon
     csit-weekly-list-boron: >
         distribution-deploy-boron,
@@ -237,8 +235,6 @@
         didm-csit-1node-discovery-only-nitrogen,
         distribution-csit-1node-userfeatures-all-nitrogen,
         distribution-csit-1node-userfeatures-only-nitrogen,
-        distribution-csit4-1node-userfeatures-all-nitrogen,
-        distribution-csit4-1node-userfeatures-only-nitrogen,
         dluxapps-csit-1node-yangman-all-nitrogen,
         dluxapps-csit-1node-yangman-only-nitrogen,
         genius-csit-1node-upstream-all-nitrogen,