Merge "Install odl-mdsal-trace to apex jobs"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 8d5b4f0ae98af9935658df6573fae6b069c47b34..8f91a7f7b4ff7e733724e2f3d5ff98041c85aa01 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'
@@ -44,7 +38,6 @@
     nexus-snapshot-repo: opendaylight.snapshot
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
     lftools-version: <1.0.0
-    packer-version: 1.2.4
 
     # defaults for parameters installing openstack for csit jobs
     devstack-hash: ''
@@ -56,6 +49,7 @@
     enable-openstack-services: ''
     enable-openstack-compute-services: ''
     enable-openstack-network-services: 'neutron,neutron-api,neutron-dhcp,neutron-metadata-agent'
+    enable-gre-type-driver: 'no'
     ipsec-vxlan-tunnels-enabled: 'no'
     lbaas-service-provider: ''
     num-openstack-sites: 1
@@ -73,6 +67,7 @@
     os-ctl-cnt: 0
     os-cmp-cnt: 0
     os-std-topo: '0cmb-1ctl-2cmp'
+    ovs-install: ''
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -88,30 +83,31 @@
     sm-features: ''
 
     # CSIT images configuration
-    openstack_system_image_queens: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
-    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 - 20180823-152917.621
+    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 - 20180723-235345.727
+    openstack_system_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
     openstack_system2_count: 0
     openstack_system2_flavor: odl-standard-1
-    openstack_system2_image: ZZCI - CentOS 7 - devstack - 20180723-235345.727
+    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
@@ -127,7 +123,6 @@
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode
-        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
         -Djenkins
         -Dmaven.repo.local=/tmp/r
         -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r