Merge "Revert "Remove unused maven merge job""

[releng/builder.git] / jjb / ovil / ovil.yaml

diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml
index 1ce01adec0ba1d9b3ec8063022335c4a5922e68f..870839d265d6a05cfe305f28892234c53ada9f30 100644 (file)
--- a/jjb/ovil/ovil.yaml
+++ b/jjb/ovil/ovil.yaml
@@ -2,8 +2,7 @@
 - project:
     name: ovil
     jobs:
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: ovil
@@ -12,9 +11,7 @@
       - oxygen:
           branch: master
     mvn-settings: ovil-settings
-    mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
 
     dependencies: ''
     email-upstream: '[ovil]'
@@ -26,10 +23,9 @@
 - project:
     name: ovil-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ovil'
     project-name: 'ovil'
     branch: 'master'
     mvn-settings: 'ovil-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'