Merge "Switch the csit-verify-1node to use job prefix"

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

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 50fedfac1931ce325c8de8af6b9bf675ca5f337c..985d6b25e0f08a26c310b15b6662fc21374d1d46 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -2,12 +2,10 @@
 - project:
     name: p4plugin-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'p4plugin'
@@ -25,10 +23,13 @@
     email-upstream: '[p4plugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'p4plugin'
     project-name: 'p4plugin'