X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-defaults.yaml;h=b0fc45b597c3dd70f95ad770dc965319f06896da;hb=a18648639efb03b109ce8e447feb77b8edf7a251;hp=877a2cfa20c511c8666081d4a171050be1fe4db2;hpb=ec8eb5fea0de5f460f1c195f2aa619fe7f6cff60;p=releng%2Fbuilder.git

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 877a2cfa2..b0fc45b59 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -11,8 +11,9 @@
 
     # Timeout in minutes
     build-timeout: 360
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-4c-4g
     schedule: ''
+    schedule-daily: 'H H * * *'
     schedule-saturday: 'H H * * 6'
     schedule-weekly: 'H 23 * * 6'
     schedule-high-frequency: 'H H/4 * * *'
@@ -67,26 +68,29 @@
 
     # Distribution bundle URL
     bundle-url: 'last'
+    repo-url: ''
+    install-features: ''
+    sm-repos: ''
+    sm-features: ''
 
     # CSIT images configuration
-    openstack_system_image_newton: 'CentOS 7 - devstack-newton - 20171014-2147'
     openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 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: v1-performance-1
-    docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
+    docker_system_flavor: odl-standard-1
+    docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311
     odl_system_count: 1
-    odl_system_flavor: v1-performance-2
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180109-0417
+    odl_system_flavor: odl-highcpu-4
+    odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
-    openstack_system_flavor: v1-performance-4
+    openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: v1-performance-1
+    openstack_system2_flavor: odl-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v1-performance-1
+    tools_system_flavor: odl-highcpu-2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options
@@ -106,7 +110,6 @@
     # Maven / Java
     java-version: 'openjdk8'
     jre: 'openjdk8'
-    jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode
@@ -183,26 +186,39 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-fluorine: >
+        netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-oxygen
+        netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
     csit-high-frequency-list-nitrogen: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-nitrogen
+        netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen
     csit-high-frequency-list-carbon: >
-        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon
+    csit-sanity-list-fluorine: >
+        openflowplugin-csit-1node-sanity-only-fluorine,
+        distribution-sanity-fluorine
     csit-sanity-list-oxygen: >
-        openflowplugin-csit-1node-sanity-only-oxygen
+        openflowplugin-csit-1node-sanity-only-oxygen,
+        distribution-sanity-oxygen
     csit-sanity-list-nitrogen: >
-        openflowplugin-csit-1node-sanity-only-nitrogen
+        openflowplugin-csit-1node-sanity-only-nitrogen,
+        distribution-sanity-nitrogen
     csit-sanity-list-carbon: >
-        openflowplugin-csit-1node-sanity-only-carbon
+        openflowplugin-csit-1node-sanity-only-carbon,
+        distribution-sanity-carbon
+    csit-weekly-list-fluorine: >
+        controller-csit-1node-notifications-longevity-only-fluorine,
+        controller-csit-3node-drb-partnheal-longevity-only-fluorine,
+        controller-csit-3node-drb-precedence-longevity-only-fluorine,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-fluorine,
+        bgpcep-csit-3node-bgpclustering-longevity-only-fluorine,
+        openflowplugin-csit-1node-longevity-only-fluorine
     csit-weekly-list-oxygen: >
         controller-csit-1node-notifications-longevity-only-oxygen,
         controller-csit-3node-drb-partnheal-longevity-only-oxygen,
         controller-csit-3node-drb-precedence-longevity-only-oxygen,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-oxygen,
         bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
-        distribution-deploy-oxygen,
-        distribution-offline-oxygen,
         openflowplugin-csit-1node-longevity-only-oxygen
     csit-weekly-list-nitrogen: >
         controller-csit-1node-notifications-longevity-only-nitrogen,
@@ -210,8 +226,6 @@
         controller-csit-3node-drb-precedence-longevity-only-nitrogen,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen,
         bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen,
-        distribution-deploy-nitrogen,
-        distribution-offline-nitrogen,
         openflowplugin-csit-1node-longevity-only-nitrogen
     csit-weekly-list-carbon: >
         controller-csit-1node-notifications-longevity-only-carbon,
@@ -221,6 +235,4 @@
         controller-csit-3node-drb-precedence-longevity-only-carbon,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon,
         bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
-        distribution-deploy-carbon,
-        distribution-offline-carbon,
         openflowplugin-csit-1node-longevity-only-carbon