Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 714034dbecd30bb2da4cf3aa10b95eada96f0046..7ead8dd891291b7f28d10e61e155243863f7dc95 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -3,26 +3,17 @@
     name: p4plugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'p4plugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[p4plugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
@@ -30,11 +21,10 @@
 - project:
     name: p4plugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
     mvn-settings: 'p4plugin-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'