X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdefaults.yaml;h=cc01016fb6b772b1f98fe039ff52439d7da044ba;hb=827db429d86816776fce4da7a78fff4725320692;hp=7a9a4a3f009dd8aeeff2daa7fa67c4b02112d7cd;hpb=823c8e48e965248d837b4dafc81368f8ba8fcecf;p=releng%2Fbuilder.git

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 7a9a4a3f0..cc01016fb 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -3,18 +3,16 @@
 
 - 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'
 
+    # File triggers
+    files: '**'
+    forbidden-files: ''
+
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-builder-4c-4g
@@ -40,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: ''
@@ -52,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
@@ -69,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: ''
@@ -84,30 +83,15 @@
     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
-    stack-template: csit-2-instance-type.yaml
-    docker_system_count: 1
-    docker_system_flavor: odl-standard-1
-    docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311
-    odl_system_count: 1
-    odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180723-235310.638
-    openstack_system_count: 1
-    openstack_system_flavor: odl-standard-4
-    openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
-    openstack_system2_count: 0
-    openstack_system2_flavor: odl-standard-1
-    openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
-    tools_system_count: 1
-    tools_system_flavor: odl-highcpu-2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+    openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
+    openstack_pike_system_image: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
 
     # 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
@@ -123,7 +107,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
@@ -196,16 +179,30 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-neon: >
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
     csit-high-frequency-list-fluorine: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
+    csit-sanity-list-neon: >
+        openflowplugin-csit-1node-sanity-only-neon,
+        distribution-sanity-neon
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine
     csit-sanity-list-oxygen: >
         openflowplugin-csit-1node-sanity-only-oxygen,
         distribution-sanity-oxygen
+    csit-weekly-list-neon: >
+        controller-csit-1node-notifications-longevity-only-neon,
+        controller-csit-3node-drb-partnheal-longevity-only-neon,
+        controller-csit-3node-drb-precedence-longevity-only-neon,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-neon,
+        bgpcep-csit-3node-bgpclustering-longevity-only-neon,
+        distribution-deploy-neon,
+        distribution-offline-neon,
+        openflowplugin-csit-1node-longevity-only-neon
     csit-weekly-list-fluorine: >
         controller-csit-1node-notifications-longevity-only-fluorine,
         controller-csit-3node-drb-partnheal-longevity-only-fluorine,