X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdefaults.yaml;h=7f96145604411bb481654e20263d6ca6f0f1028f;hb=93a5304ef04620630cbd6de14694607048bf2aa3;hp=305c52e1be67a630f68dffac8471ae871fdae934;hpb=926d70991617b65ccd185d1bb33b9adb902d533e;p=releng%2Fbuilder.git

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 305c52e1b..7f9614560 100644
--- 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,36 +83,21 @@
     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
-    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
-    openstack_system_count: 1
-    openstack_system_flavor: odl-standard-4
-    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 - 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
+    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
-    verify-branch: stable/oxygen
+    verify-branch: stable/fluorine
     # Value for ODL_STREAM
-    verify-stream: oxygen
+    verify-stream: fluorine
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
@@ -128,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
@@ -201,12 +179,17 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-sodium: >
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-sodium
     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-sodium: >
+        openflowplugin-csit-1node-sanity-only-sodium,
+        distribution-sanity-sodium
     csit-sanity-list-neon: >
         openflowplugin-csit-1node-sanity-only-neon,
         distribution-sanity-neon
@@ -216,6 +199,15 @@
     csit-sanity-list-oxygen: >
         openflowplugin-csit-1node-sanity-only-oxygen,
         distribution-sanity-oxygen
+    csit-weekly-list-sodium: >
+        controller-csit-1node-notifications-longevity-only-sodium,
+        controller-csit-3node-drb-partnheal-longevity-only-sodium,
+        controller-csit-3node-drb-precedence-longevity-only-sodium,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-sodium,
+        bgpcep-csit-3node-bgpclustering-longevity-only-sodium,
+        distribution-deploy-sodium,
+        distribution-offline-sodium,
+        openflowplugin-csit-1node-longevity-only-sodium
     csit-weekly-list-neon: >
         controller-csit-1node-notifications-longevity-only-neon,
         controller-csit-3node-drb-partnheal-longevity-only-neon,