Merge "Migrate maven to freestyle for merge"

[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 0395c2e3dc885f1a4a5f8279971b33d05898faf1..7fe777dc112598a2fdee7bbd338eb3345020bc4a 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -21,12 +21,6 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
-        - stable-lithium:
-            disabled: true
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -110,17 +104,16 @@
 
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
-    disabled: {disabled}
-    node: centos7-docker-2c-4g
-
-    project-type: freestyle
-    jdk: '{jdk}'
-    description: 'Integration tests for the OVSDB project against different versions of OVS and branches. This job runs nightly. '
 
     # 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}'
@@ -192,5 +185,5 @@
     publishers:
         - email-notification:
             email-prefix: '[ovsdb]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'