Merge "Update hwvtep jobs to devstack tip"

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 100b7110384f2642cec3ab52c3fd5a1d4773190c..772189a6f725391774f9de2fe6c14e9f7468a227 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -2,12 +2,10 @@
 - project:
     name: aaa-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'aaa'
@@ -25,14 +23,16 @@
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
 - project:
     name: aaa-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'aaa'
@@ -50,14 +50,16 @@
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
 - project:
     name: aaa-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'aaa'
@@ -76,6 +78,9 @@
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
 - project:
     name: aaa-sonar
     jobs:

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 33df2fd7df51e9025dfa19413417ccf6b4092a79..59f4e5310987bd595910f09386bcf80bb54541d7 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -2,12 +2,10 @@
 - project:
     name: alto-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'alto'
@@ -25,14 +23,16 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
     name: alto-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'alto'
@@ -50,14 +50,16 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
     name: alto-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'alto'
@@ -76,6 +78,9 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 931eabae9693c
+
 - project:
     name: alto-sonar
     jobs:

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 572547004d92b4e46a3f4ca939552584e43ecda3..e6c1183545c35365e2872a834f7a7530e297e7a0 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -2,11 +2,10 @@
 - project:
     name: atrium-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'atrium'
@@ -24,14 +23,16 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'atrium'
@@ -49,14 +50,16 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'atrium'
@@ -75,6 +78,9 @@
     email-upstream: '[atrium]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
 - project:
     name: atrium-sonar
     jobs:

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 614df1ae66765fcc80bedad42c655a5ddb78c681..c242f5343c1fc8ba5bf694f82b71c6b3877f9a9a 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -2,12 +2,10 @@
 - project:
     name: bgpcep-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'bgpcep'
@@ -31,14 +29,16 @@
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
     name: bgpcep-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'bgpcep'
@@ -62,14 +62,16 @@
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
     name: bgpcep-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'bgpcep'
@@ -94,6 +96,9 @@
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 9427a05049030
+
 - project:
     name: bgpcep-sonar
     jobs:

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index e7984cc1389881f5e31aea75ef69ea76676af225..759a5564d37cbefca5dcac2d4b76ab05e9e28a89 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -2,12 +2,10 @@
 - project:
     name: bier-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'bier'
@@ -25,14 +23,16 @@
     email-upstream: '[bier]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'bier'
@@ -50,14 +50,16 @@
     email-upstream: '[bier]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'bier'
@@ -76,6 +78,9 @@
     email-upstream: '[bier]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-sonar
     jobs:

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 768db6fbd8599feba4c4b32c930bd9d868106511..d2a4240e7665fc05010790b5bf301ad8ef96421c 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -2,11 +2,10 @@
 - project:
     name: capwap-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'capwap'
@@ -24,14 +23,16 @@
     email-upstream: '[capwap]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
+
 - project:
     name: capwap-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'capwap'
@@ -49,14 +50,16 @@
     email-upstream: '[capwap]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
+
 - project:
     name: capwap-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'capwap'
@@ -75,6 +78,9 @@
     email-upstream: '[capwap]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
+
 - project:
     name: capwap
     jobs:

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 16e151fd39d0566fda95dc960aeb26d097258caa..e4a06da35d66c5aaccec0df0aea7fcf0c4d5ba5c 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -2,11 +2,10 @@
 - project:
     name: cardinal-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'cardinal'
@@ -24,14 +23,16 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
     name: cardinal-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'cardinal'
@@ -49,14 +50,16 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
     name: cardinal-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'cardinal'
@@ -75,6 +78,9 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
     name: cardinal-sonar
     jobs:

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index ea5576d16df58ac94c308600169d41758da6f7b2..e9d0f32f9262c278d4fe182d7fa06867fe6707bd 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -2,11 +2,10 @@
 - project:
     name: centinel-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'centinel'
@@ -24,14 +23,16 @@
     email-upstream: '[centinel]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96bf9b3fefd8a
+
 - project:
     name: centinel-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'centinel'
@@ -49,14 +50,16 @@
     email-upstream: '[centinel]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96bf9b3fefd8a
+
 - project:
     name: centinel-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'centinel'
@@ -75,6 +78,9 @@
     email-upstream: '[centinel]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96bf9b3fefd8a
+
 - project:
     name: centinel-sonar
     jobs:

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index 63820e7e56f4cc301e8535ec4af9e150b3d3f0fc..eba49dffaa816d7d8fc32b41e8ff68e1d68af232 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -2,12 +2,10 @@
 - project:
     name: coe-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     project: 'coe'
     project-name: 'coe'
@@ -25,14 +23,16 @@
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
 - project:
     name: coe-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'coe'
     project-name: 'coe'
@@ -50,13 +50,15 @@
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
 - project:
     name: coe-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'coe'
     project-name: 'coe'
@@ -75,6 +77,9 @@
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
 - project:
     name: coe-sonar
     jobs:

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 61bed1501b377ea64fd6525cf5fbab322bc2032c..ba8a22f1b4859133c923186f22df971944a2cee9 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,13 +2,11 @@
 - project:
     name: controller-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-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'controller'
@@ -26,14 +24,16 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
     name: controller-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'controller'
@@ -51,14 +51,16 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
     name: controller-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'controller'
@@ -77,6 +79,9 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
 - project:
     name: controller-sonar
     jobs:

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index cc66623c48c083191a3153da1a2c2ad39fb6f551..19fa1e364766246976d186dbbff6a09c823d7cd0 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -2,10 +2,9 @@
 - project:
     name: coretutorials-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'coretutorials'
@@ -23,13 +22,15 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
 - project:
     name: coretutorials-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'coretutorials'
@@ -47,13 +48,15 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
 - project:
     name: coretutorials-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'coretutorials'
@@ -72,6 +75,9 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
 - project:
     name: coretutorials-sonar
     jobs:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 1a4b42b91e5f0818a7df2d8e6a759896ef4cfffa..ba6c34e3c015b7d0e6157afc22f407e6dd3d3a68 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -2,12 +2,10 @@
 - project:
     name: daexim-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     project: 'daexim'
     project-name: 'daexim'
@@ -25,14 +23,16 @@
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
 - project:
     name: daexim-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'daexim'
     project-name: 'daexim'
@@ -50,6 +50,9 @@
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
 - project:
     name: daexim-sonar
     jobs:

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 833b5fa1e2ce30af8fdbb00686c3a2c499019670..b3b7910e3cfb9e43ebad694008c829744181d27a 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -2,11 +2,10 @@
 - project:
     name: didm-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'didm'
@@ -24,14 +23,16 @@
     email-upstream: '[didm]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6338c870f5
+
 - project:
     name: didm-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'didm'
@@ -49,14 +50,16 @@
     email-upstream: '[didm]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6338c870f5
+
 - project:
     name: didm-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'didm'
@@ -75,6 +78,9 @@
     email-upstream: '[didm]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6338c870f5
+
 - project:
     name: didm-sonar
     jobs:

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 853888f3fcd5ab72087737b71663fb5bff310be5..930a50c63a5a6ab02c69672fb3b9d523fba1b885 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -2,12 +2,10 @@
 - project:
     name: dlux-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'dlux'
@@ -25,14 +23,16 @@
     email-upstream: '[dlux] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6a0327484f
+
 - project:
     name: dlux-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'dlux'
@@ -50,14 +50,16 @@
     email-upstream: '[dlux] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6a0327484f
+
 - project:
     name: dlux-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'dlux'
@@ -76,6 +78,9 @@
     email-upstream: '[dlux] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6a0327484f
+
 - project:
     name: dlux-sonar
     jobs:

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index f1d9d7b25f2d7dd2072776fc2550341d1baef35e..b9cdd978b237a4fae076b4bc102dd0a9b51def06 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -2,12 +2,10 @@
 - project:
     name: dluxapps-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     project: 'dluxapps'
     project-name: 'dluxapps'
@@ -25,14 +23,16 @@
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6fb1e65bf9
+
 - project:
     name: dluxapps-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'dluxapps'
     project-name: 'dluxapps'
@@ -50,14 +50,16 @@
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6fb1e65bf9
+
 - project:
     name: dluxapps-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'dluxapps'
     project-name: 'dluxapps'
@@ -76,6 +78,9 @@
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e6fb1e65bf9
+
 - project:
     name: dluxapps-sonar
     jobs:

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index d080873aac58feec86af8e52083be3f3ae5d2c48..14096267a27ddebe1a4ea074a02c00320ce1047b 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -2,12 +2,10 @@
 - project:
     name: eman-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'eman'
@@ -25,14 +23,16 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'eman'
@@ -50,14 +50,16 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'eman'
@@ -76,6 +78,9 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-sonar
     jobs:

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 51513b7c17dc7c52040884c909f7511a5ebdc6eb..98c80bc87357e9155c311d2aa8dd63e0a42054be 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -2,12 +2,10 @@
 - project:
     name: faas-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'faas'
@@ -25,14 +23,16 @@
     email-upstream: '[faas]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
+
 - project:
     name: faas-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'faas'
@@ -50,14 +50,16 @@
     email-upstream: '[faas]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
+
 - project:
     name: faas-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'faas'
@@ -76,6 +78,9 @@
     email-upstream: '[faas]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
+
 - project:
     name: faas-sonar
     jobs:

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 170b0a4129b65937b2b0117b55e28c8c79acee67..10b837d8949fe0a8ef002e7f86731e26a91f17a0 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -2,11 +2,10 @@
 - project:
     name: federation-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution-check-{stream}'
 
     project: 'federation'
     project-name: 'federation'
@@ -24,14 +23,16 @@
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
 - project:
     name: federation-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution-check-{stream}'
 
     project: 'federation'
     project-name: 'federation'
@@ -49,14 +50,16 @@
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
 - project:
     name: federation-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution-check-{stream}'
 
     project: 'federation'
     project-name: 'federation'
@@ -75,6 +78,9 @@
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
 - project:
     name: federation-sonar
     jobs:

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 11533fa56961fe6eb8d5053669cc645acb06fcc6..8fac19028ad1acc14403b6e95ebd0d017a7ec4b9 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -2,13 +2,11 @@
 - project:
     name: genius-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-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'genius'
@@ -31,14 +29,16 @@
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'genius'
@@ -61,14 +61,16 @@
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'genius'
@@ -92,6 +94,9 @@
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-sonar
     jobs:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 4ac606a6b6a1dd17223170e1478e9c4b655787d6..a89c03329bc64ee17874a73ceffa95e44f9f3b2a 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -2,12 +2,10 @@
 - project:
     name: groupbasedpolicy-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'groupbasedpolicy'
@@ -30,14 +28,16 @@
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'groupbasedpolicy'
@@ -60,14 +60,16 @@
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'groupbasedpolicy'
@@ -91,6 +93,9 @@
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-sonar
     jobs:

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 7912a13806c8313a7b67a4e9c30960a01e3e9fd1..59a0c61460389b009d0bd4620ba21a62ce160135 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -2,12 +2,10 @@
 - project:
     name: vbd-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'honeycomb/vbd'
@@ -25,14 +23,16 @@
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'honeycomb/vbd'
@@ -50,14 +50,16 @@
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'honeycomb/vbd'
@@ -76,6 +78,9 @@
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-sonar
     jobs:

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index f47e88d75458db4c051bcb873c3d893b280c9180..8f4eb59fcf233b72f2786d438d00dc4da985dbbb 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -2,13 +2,11 @@
 - project:
     name: infrautils-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-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'infrautils'
@@ -26,14 +24,16 @@
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
     name: infrautils-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'infrautils'
@@ -51,14 +51,16 @@
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
     name: infrautils-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'infrautils'
@@ -77,6 +79,9 @@
     email-upstream: '[infrautils] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fca0367756c
+
 - project:
     name: infrautils-sonar
     jobs:

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 377a9d17588416924ebe0277a26c7caffa88fa36..fbad4140664a4211e6079d2625d5557f176ab042 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -3,14 +3,14 @@
 - project:
     name: distribution
     jobs:
-      # {project-name}- is generic template, distribution- is project specific.
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-sonar'
+      # gerrit- is generic template, distribution- is project specific.
       - 'distribution-merge-{stream}'
       - 'distribution-verify-{stream}'
       - 'distribution-deploy-{stream}'
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
+      - gerrit-maven-clm
+      - gerrit-maven-sonar
       - gerrit-tox-verify
 
     project: integration/distribution

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index aa58386d0b53ad849cfb0ca695a8a1685b6257f5..30ecd8b5528d5a104b28bf21fa373a338d8b96ea 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -2,11 +2,10 @@
 - project:
     name: iotdm-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'iotdm'
@@ -24,14 +23,16 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
 - project:
     name: iotdm-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'iotdm'
@@ -49,14 +50,16 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
 - project:
     name: iotdm-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'iotdm'
@@ -75,6 +78,9 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fd6e9453970
+
 - project:
     name: iotdm-sonar
     jobs:

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 206efa4af2d835d6d4ebba1cde050440d2a78f07..87d4d3337235ac550809965fea8935d243a3f1b6 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,10 +2,9 @@
 - project:
     name: jsonrpc-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -23,13 +22,15 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -47,13 +48,15 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -72,6 +75,9 @@
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-sonar
     jobs:

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index acb8c26dcf46d4000b6a2848358b5b67483ea1e3..147264acd62b3da6459ccc7602a17c3c5bc38f06 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -2,12 +2,10 @@
 - project:
     name: l2switch-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'l2switch'
@@ -30,14 +28,16 @@
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
     name: l2switch-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'l2switch'
@@ -60,14 +60,16 @@
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
     name: l2switch-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'l2switch'
@@ -91,6 +93,9 @@
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
     name: l2switch-sonar
     jobs:

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 8f66995e8b9d7bf26d27745302f3f7e0ae5c7c46..1c136a5a3fbcc9757b57483a39695aaed81c598d 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -2,11 +2,10 @@
 - project:
     name: lacp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'lacp'
@@ -24,14 +23,16 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
+
 - project:
     name: lacp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'lacp'
@@ -49,14 +50,16 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
+
 - project:
     name: lacp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'lacp'
@@ -75,6 +78,9 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
+
 - project:
     name: lacp-sonar
     jobs:

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 55b67066e916d4eb1bb0a3640c3556c238e73fcd..de70c4f65decad866651f3ccc8c7b28f9fca3fff 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -2,12 +2,10 @@
 - project:
     name: lispflowmapping-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'lispflowmapping'
@@ -26,14 +24,16 @@
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
 
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
 - project:
     name: lispflowmapping-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'lispflowmapping'
@@ -52,14 +52,16 @@
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
 
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
 - project:
     name: lispflowmapping-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'lispflowmapping'
@@ -79,6 +81,9 @@
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
 
+    # Used by the release job
+    staging-profile-id: 96fff2503b766
+
 - project:
     name: lispflowmapping-sonar
     jobs:

diff --git a/packer/templates/baseline.json b/packer/templates/baseline.json
index 86fee0358220dd7ec92b37ffb85a4315f3df47c8..e3e0d0fc170b7a8f67c34299a9dcda3b6d479976 100644 (file)
--- a/packer/templates/baseline.json
+++ b/packer/templates/baseline.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/templates/devstack-pre-pip-newton.json b/packer/templates/devstack-pre-pip-newton.json
index 5de50fcb9e7923f4d70bdf84c22c0f74776b095f..74f89faa9e105d5869d13323a91d568b0bec9fa1 100644 (file)
--- a/packer/templates/devstack-pre-pip-newton.json
+++ b/packer/templates/devstack-pre-pip-newton.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index 1234aa531393adf95364504b1d06ad36a73ca9fb..dc38a548161e94a697b0782e89b644d30d303538 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/templates/docker.json b/packer/templates/docker.json
index c622ad26c838f15dad96329894d94148df1a8039..5fccb455aa46d95c0c5f1b2a37c32aca63d380ae 100644 (file)
--- a/packer/templates/docker.json
+++ b/packer/templates/docker.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/templates/java-builder.json b/packer/templates/java-builder.json
index adae8a1c473a6a3834aaf2edabfe62150a70d42e..ef5f42e0453e3340c13f34d243b58b8d76583eca 100644 (file)
--- a/packer/templates/java-builder.json
+++ b/packer/templates/java-builder.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index e361c805764785cfeb5dd9fd377ebb5a325f495a..d79322dc390ce544198122b1fa1fcf5b2641f428 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
-      "source_image": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"

diff --git a/packer/vars/centos.json b/packer/vars/centos.json
index ec911de818d21671bc1913eff6cf5eed26e7388b..30c0d4a1a2628158289ac6b08ea96eb41a27182e 100644 (file)
--- a/packer/vars/centos.json
+++ b/packer/vars/centos.json
@@ -1,5 +1,5 @@
 {
-  "public_base_image": "2d659868-df96-4f8e-8ce1-bd32bb86805a",
+  "public_base_image": "CentOS 7 (PVHVM)",
   "public_cloud_user": "root",
   "private_base_image": "CentOS 7 (cloudimg 1510)",
   "private_cloud_user": "centos",