Merge "Add a prefix variable to defaults as blank"

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

diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml
index 7c584d8356df7c2f9a2f13976aca977c3834b43b..2e5d81414dfaba3474c0e028eb2ce54f13ad0568 100644 (file)
--- a/jjb/ovil/ovil.yaml
+++ b/jjb/ovil/ovil.yaml
@@ -2,16 +2,14 @@
 - project:
     name: ovil
     jobs:
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-tox-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
 
     project: ovil
     project-name: ovil
     stream:
       - oxygen:
           branch: master
-    jdk: openjdk8
     mvn-settings: ovil-settings
     mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -27,7 +25,7 @@
 - project:
     name: ovil-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ovil'
     project-name: 'ovil'
     branch: 'master'