Merge "Fix packaging tox-verify to run only master"

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

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index 95a1ac9b66c2eb4c3d12a0148d7e3725e477d106..5c6f81e309ca3975d3a75881cdd1b079b4aaac7a 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -2,11 +2,10 @@
 - project:
     name: messaging4transport-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}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'messaging4transport'
@@ -24,14 +23,16 @@
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a677283157db4
+
 - project:
     name: messaging4transport-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'messaging4transport'
@@ -49,14 +50,16 @@
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a677283157db4
+
 - project:
     name: messaging4transport-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'messaging4transport'
@@ -75,10 +78,13 @@
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a677283157db4
+
 - project:
     name: messaging4transport-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'messaging4transport'
     project-name: 'messaging4transport'
     branch: 'master'