Simplify autorelease to not use release tags

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index b366575ce0b406768e95077709663bd269a9a0a1..a8d548b599de4adac4d5887ede76272c92c260d1 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -58,16 +58,19 @@
     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
+    openstack_system2_count: 0
+    openstack_system2_flavor: 2 GB General Purpose v1
+    openstack_system2_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 +78,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
 
@@ -180,8 +183,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,
@@ -223,6 +224,8 @@
         capwap-csit-1node-ac-only-nitrogen,
         centinel-csit-1node-basic-all-nitrogen,
         centinel-csit-1node-basic-only-nitrogen,
+        coe-csit-1node-openstack-ocata-kubernetes-nitrogen,
+        coe-csit-3node-openstack-ocata-kubernetes-nitrogen,
         controller-csit-1node-akka1-all-nitrogen,
         controller-csit-1node-akka1-only-nitrogen,
         controller-csit-1node-periodic-benchmark-all-nitrogen,
@@ -237,8 +240,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,
@@ -279,6 +280,8 @@
         netconf-csit-1node-periodic-scale-only-nitrogen,
         netconf-csit-1node-userfeatures-all-nitrogen,
         netconf-csit-1node-userfeatures-only-nitrogen,
+        netconf-csit-3node-cluster-stress-all-nitrogen,
+        netconf-csit-3node-cluster-stress-only-nitrogen,
         netconf-csit-3node-clustering-all-nitrogen,
         netconf-csit-3node-clustering-only-nitrogen,
         netconf-csit-3node-periodic-clustering-scale-all-nitrogen,
@@ -324,8 +327,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,
@@ -423,6 +424,8 @@
         capwap-csit-1node-ac-only-carbon,
         centinel-csit-1node-basic-all-carbon,
         centinel-csit-1node-basic-only-carbon,
+        coe-csit-1node-openstack-ocata-kubernetes-carbon,
+        coe-csit-3node-openstack-ocata-kubernetes-carbon,
         controller-csit-1node-akka1-all-carbon,
         controller-csit-1node-akka1-only-carbon,
         controller-csit-1node-periodic-benchmark-all-carbon,
@@ -477,6 +480,8 @@
         netconf-csit-1node-periodic-scale-only-carbon,
         netconf-csit-1node-userfeatures-all-carbon,
         netconf-csit-1node-userfeatures-only-carbon,
+        netconf-csit-3node-cluster-stress-all-carbon,
+        netconf-csit-3node-cluster-stress-only-carbon,
         netconf-csit-3node-clustering-all-carbon,
         netconf-csit-3node-clustering-only-carbon,
         netconf-csit-3node-periodic-clustering-scale-all-carbon,
@@ -522,8 +527,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,
@@ -664,6 +667,8 @@
         netconf-csit-1node-periodic-scale-only-boron,
         netconf-csit-1node-userfeatures-all-boron,
         netconf-csit-1node-userfeatures-only-boron,
+        netconf-csit-3node-cluster-stress-all-boron,
+        netconf-csit-3node-cluster-stress-only-boron,
         netconf-csit-3node-clustering-all-boron,
         netconf-csit-3node-clustering-only-boron,
         netconf-csit-3node-periodic-clustering-scale-all-boron,
@@ -717,8 +722,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,