X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-defaults.yaml;h=2f1e0251232cf8b5220c1c515a31bbf0201539e1;hb=refs%2Fchanges%2F93%2F66693%2F1;hp=224b98e54f1959f2e1b9128fb5a1403df8f07f86;hpb=d5bb0c9394923f644533410182566043e95d6181;p=releng%2Fbuilder.git

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 224b98e54..2f1e02512 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -25,8 +25,8 @@
     # lf-infra defaults
     jenkins-ssh-credential: opendaylight-jenkins-ssh
     gerrit-server-name: OpenDaylight
-    # server-name is deprecated, use gerrit-server-name moving forward.
-    server-name: 'OpenDaylight'
+    mvn-site-id: opendaylight-site
+    mvn-staging-id: opendaylight-staging
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
     lftools-version: <1.0.0
 
@@ -56,28 +56,31 @@
     archive-artifacts: ''
     branch: master
     distribution_branch: '$GERRIT_BRANCH'
-    os-cloud: rackspace
+    os-cloud: vex
 
     # Distribution bundle URL
     bundle-url: 'last'
 
     # 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: 4 GB General Purpose v1
-    docker_system_image: CentOS 7 - docker - 20170808-0528
+    docker_system_flavor: v1-performance-1
+    docker_system_image: ZZCI - CentOS 7 - docker - 20171209-0317
     odl_system_count: 1
-    odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170807-2145
+    odl_system_flavor: v1-performance-2
+    odl_system_image: ZZCI - CentOS 7 - java-builder - 20171209-0032
     openstack_system_count: 1
-    openstack_system_flavor: 8 GB General Purpose v1
-    openstack_system_image: CentOS 7 - devstack - 20170808-0528
+    openstack_system_flavor: v1-performance-4
+    openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: 2 GB General Purpose v1
-    openstack_system2_image: CentOS 7 - devstack - 20170808-0528
+    openstack_system2_flavor: v1-performance-1
+    openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170808-0158
+    tools_system_flavor: v1-performance-1
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options
     robot-options: ''
@@ -94,6 +97,8 @@
     verify-jdkversion: openjdk8
 
     # Maven / Java
+    java-version: 'openjdk8'
+    jre: 'openjdk8'
     jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version
@@ -102,6 +107,12 @@
         -Djenkins
         -Dmaven.repo.local=/tmp/r
         -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+    opendaylight-infra-parallel-mvn-opts: |
+        -T1.5C
+        {opendaylight-infra-mvn-opts}
+
+    # JavaDoc
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
 
     # Python
     toxdir: ''
@@ -177,8 +188,6 @@
         openflowplugin-csit-1node-sanity-only-nitrogen
     csit-sanity-list-carbon: >
         openflowplugin-csit-1node-sanity-only-carbon
-    csit-sanity-list-boron: >
-        openflowplugin-csit-1node-sanity-only-boron
     csit-weekly-list-oxygen: >
         controller-csit-1node-notifications-longevity-only-oxygen,
         controller-csit-3node-drb-partnheal-longevity-only-oxygen,
@@ -187,7 +196,7 @@
         bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
         distribution-deploy-oxygen,
         distribution-offline-oxygen,
-        openflowplugin-csit-1node-periodic-longevity-only-oxygen
+        openflowplugin-csit-1node-longevity-only-oxygen
     csit-weekly-list-nitrogen: >
         controller-csit-1node-notifications-longevity-only-nitrogen,
         controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
@@ -196,7 +205,7 @@
         bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen,
         distribution-deploy-nitrogen,
         distribution-offline-nitrogen,
-        openflowplugin-csit-1node-periodic-longevity-only-nitrogen
+        openflowplugin-csit-1node-longevity-only-nitrogen
     csit-weekly-list-carbon: >
         controller-csit-1node-notifications-longevity-only-carbon,
         controller-csit-3node-cs-chasing-leader-longevity-only-carbon,
@@ -207,8 +216,4 @@
         bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
         distribution-deploy-carbon,
         distribution-offline-carbon,
-        openflowplugin-csit-1node-periodic-longevity-only-carbon
-    csit-weekly-list-boron: >
-        distribution-deploy-boron,
-        distribution-offline-boron,
-        openflowplugin-csit-1node-periodic-longevity-only-boron
+        openflowplugin-csit-1node-longevity-only-carbon