Merge "Revert "Add refspec to validate-autorelease job""

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 94c5b1381e05681b868e38466a86265973df1a39..d7fdaa78deb5880ade7c1f421de0a9e83be56432 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 - 20170609-0259
+    odl_system_image: CentOS 7 - java-builder - 20170707-0359
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
     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: ''
@@ -75,9 +75,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/boron
+    verify-branch: stable/carbon
     # Value for ODL_STREAM
-    verify-stream: boron
+    verify-stream: carbon
     verify-karaf-version: karaf3
     verify-jdkversion: openjdk8
 
@@ -320,8 +320,6 @@
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-nitrogen,
         nic-csit-1node-basic-all-nitrogen,
         nic-csit-1node-basic-only-nitrogen,
-        nic-csit-1node-vtnrenderer-all-nitrogen,
-        nic-csit-1node-vtnrenderer-only-nitrogen,
         ocpplugin-csit-1node-get-all-nitrogen,
         ocpplugin-csit-1node-get-only-nitrogen,
         ocpplugin-csit-1node-scalability-all-nitrogen,
@@ -518,8 +516,6 @@
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
         nic-csit-1node-basic-all-carbon,
         nic-csit-1node-basic-only-carbon,
-        nic-csit-1node-vtnrenderer-all-carbon,
-        nic-csit-1node-vtnrenderer-only-carbon,
         ocpplugin-csit-1node-get-all-carbon,
         ocpplugin-csit-1node-get-only-carbon,
         ocpplugin-csit-1node-scalability-all-carbon,
@@ -713,8 +709,6 @@
         netvirt-legacy-csit-3node-openstack-ocata-upstream-boron,
         nic-csit-1node-basic-all-boron,
         nic-csit-1node-basic-only-boron,
-        nic-csit-1node-vtnrenderer-all-boron,
-        nic-csit-1node-vtnrenderer-only-boron,
         ocpplugin-csit-1node-get-all-boron,
         ocpplugin-csit-1node-get-only-boron,
         ocpplugin-csit-1node-scalability-all-boron,