Merge "Update Fl multipatch build used in RPM full verify"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 202891e5ae7d513d590532ea6c1df4a83f219a41..632fb631fb789de7f1a9d763ef42220ed97243b3 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -3,14 +3,8 @@
 
 - defaults:
     name: global
-    functionality: global
-    stream: global
     prefix: ''  # A prefix for job names sandbox for example: user-
 
-    scriptplan: '{project}.txt'
-    configplan: '{project}.txt'
-    testplan: '{project}-{functionality}.txt'
-    streamtestplan: '{project}-{functionality}-{stream}.txt'
     karaf-version: karaf4
     build-days-to-keep: 30
     use-features-boot: 'True'
@@ -89,15 +83,15 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_system_image_queens: ZZCI - CentOS 7 - devstack-queens - 20180911-204058.666
-    openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
+    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
+    openstack_pike_system_image: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
     docker_system_flavor: odl-standard-1
     docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035
     odl_system_count: 1
     odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20181001-052252.169
+    odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
     openstack_system_count: 1
     openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
@@ -106,13 +100,14 @@
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
     tools_system_count: 1
     tools_system_flavor: odl-highcpu-2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20180723-235543.682
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
 
     # Default Robot framework options
     robot-options: ''
     trigger-jobs: ''
     debug-map: ''
     test-suites: ''
+    gate-job: 'False'
 
     # Data for csit-verify jobs
     # Branch for "last" version detection