Merge "Revert "Robot installation: Pinpoint pycparser version""

[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..39f3e92320c429c7dc21e7e9fad6b5a288bbd1b6 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,10 +103,6 @@
 - 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}'
@@ -164,7 +153,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,11 +167,11 @@
             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
@@ -190,5 +179,5 @@
     publishers:
         - email-notification:
             email-prefix: '[ovsdb]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'