Switch all projects to use new maven-merge job

[releng/builder.git] / jjb / of-config / of-config.yaml

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 7eaa59e773b7832bcf63308dcdc8f21695f09780..ab6c67a89b40ab759e512f3bc5cbd19e5bc0ad88 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -2,12 +2,9 @@
 - project:
     name: of-config-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-jobs'
 
     stream: oxygen
     project: 'of-config'
@@ -25,14 +22,15 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-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-jobs'
 
     stream: nitrogen
     project: 'of-config'
@@ -50,14 +48,15 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-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-jobs'
 
     stream: carbon
     project: 'of-config'
@@ -76,10 +75,13 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'