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 36f5732b5b9b70060d22cf54cd983c6c0c38c5cd..a8d548b599de4adac4d5887ede76272c92c260d1 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -65,6 +65,9 @@
     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 - 20170609-0220
@@ -221,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,
@@ -419,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,