Merge "Update spectrometer webapp deploy job"

[releng/builder.git] / jjb / ovsdb / ovsdb-full-integration.yaml

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 79bcbfe64d053ab1029d5d44f65b90b5fd5497e2..7971adcda7a6b433ccd20849cc7a2553bbb4feb0 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -3,8 +3,6 @@
     jobs:
         - 'ovsdb-daily-full-integration-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             branch: 'master'
@@ -21,11 +19,6 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -110,20 +103,14 @@
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
 
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
     project-type: freestyle
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
     description: 'Integration tests for the OVSDB project against different versions of OVS and branches. This job runs nightly. '
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -145,7 +132,7 @@
     triggers:
         - timed: '@midnight'
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
               - comment-added-contains-event:
                  comment-contains-value: 'runit'
@@ -164,7 +151,7 @@
     builders:
         - wipe-org-opendaylight-repo
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
             properties:
@@ -178,17 +165,18 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - run-ovsdb-it:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             stream: '{stream}'
             OVS_VERSION: '2.4.0'
         - run-ovsdb-it:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             stream: '{stream}'
             OVS_VERSION: '2.5.0'
         - jacoco-nojava-workaround
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[ovsdb]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'