Merge "Switch to using global-jjb lf-jacoco-report macro"

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 05b2cd110bb59b9a33a564dacc9678cd859fabdd..1fa078c85f12b1854c5bff4233ffabf1a1b1edab 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -25,8 +25,6 @@
     # 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'
@@ -73,7 +71,7 @@
     docker_system_image: CentOS 7 - docker - 20171016-0023
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20171014-2148
+    odl_system_image: CentOS 7 - java-builder - 20171030-1039
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
     openstack_system_image: CentOS 7 - devstack - 20171014-2147
@@ -198,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,
@@ -207,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,
@@ -218,4 +216,4 @@
         bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
         distribution-deploy-carbon,
         distribution-offline-carbon,
-        openflowplugin-csit-1node-periodic-longevity-only-carbon
+        openflowplugin-csit-1node-longevity-only-carbon