Adjust for karaf 4 not happening in carbon

1) Add projects distribution check job for k3 in nitrogen:
(to remove after the migration)

{project-name}-distribution4-check-carbon ->
{project-name}-distribution3-check-nitrogen

2) Add distribution verify jobs for k3 in nitrogen:
(to remove after the migration)

distribution4-deploy-carbon -> distribution3-deploy-nitrogen
distribution4-offline-carbon -> distribution3-offline-nitrogen
distribution4-check-carbon -> distribution3-check-nitrogen

3) distribution test jobs will run on k3 in nitrogen:
(autorelease can override this when it produces k4 distro):

integration-distribution-test-{stream}
integration-sanity-test-{stream}
integration-distribution-weekly-test-trigger-{stream}

4) Projects can start premature test for k4 in nitrogen:
(to remove after the migration):

{project}-csit4-1node-{functionality}-{install}-carbon ->
{project}-csit4-1node-{functionality}-{install}-nitrogen

Change-Id: If2e7d12d2721f293119cd36c4ec3f1f3e539710c
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 010cc886df2d8a2e73dbaadcd0b8073e74220b07..137b7ff43e7f07955c857ed1b0c183db1fbe0350 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 99e2fe1d3cbb2fa371f2bd8c06421a543ebaf25f..8615853d10801b973b256b082f675f724f546e6a 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index fd36010d1dc770fc003a8161034b447974c96588..f216efb5c1ca59b8a1d6cf538190819cd3e833bf 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index f7792a3a9b973ea5db5ef1f6dcc3530f36c56238..65fe3a3d85e47288ac918ab32fa859f4f8829a45 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -37,7 +38,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 12ad1076a07286abc514d3edbcb4e2a50abf849e..f8383a8b8c85e012784d0490a059fab402e5faad 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index a99c63d1a7052b6f93543068e9e697ffa0171834..139bff0e8e4860fbf1a20fc974e1192463cf4c36 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 95a20a7cfe9e0cfc5336f1d420e23e75afd227c6..f1d3fb98caaf6e36bdfb174ec077a08d196d4349 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index fcbbae62b45c3085f90b087381c258262116bfb7..4ac5b1b5a89cd4a6b68e2c3ada8ad3459a66c66d 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 185482da260b98072587eef850239bd3ddf73ce1..8d1679134a7ef33fe83dd34fe05d234da59430be 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index a6f1188fa3aca7025d1214def50117dfdb6e4469..97d50d454805a4746a86ac014dc88dfdca26a96c 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 00b31dc6677a1146ecb857bd6f6398273bfa051a..30568d2f1366e50e274f803823980ff77c585397 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index aaaf1e7c3954ebc1ed4445eea5e49a3e06c845df..df544b9f710223d9741ce6c2c247fe25c83dd13c 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index d581efe2e457d73fb8b6682ca19c1add3e63fa43..7ae21fed1a493afa3ce27f881207525d3d954dae 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index cef10f4edc6c70f3177d541a647042c2c3c9b08a..ead4febb2d054465ba362937b6112dc2f5b21531 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 789356b9dfb194816de742af00386e59cc2f2cc9..6d8aede2ce0566895c83e3e2ce55fc628d5a2baf 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -7,6 +7,7 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-validate-autorelease-{stream}'
 
     project: 'federation'
@@ -33,7 +34,6 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
 

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 5682d12e2579e3f3eb1430d367099721f092686c..50659e1460be24a6f5f1fd3fac127df1b6742ca0 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -36,7 +37,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 6b5b7805d2f3469de9cf1a461fe934ad8ff385e7..5df80371467eae3e3b9085ab6c874a4559f9e7fa 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -36,7 +37,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 2e8f863db8e2c2b414459015d6e7fdcff380251c..a8729cee54587b40fe7712de6523d23a11e6792d 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 97a2d5f678bc2df52401942898e765f120c111dc..004da6b48f70e7d13781b36bf9adf7a47dbb244b 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index e1f68aca986374a95e291afb34acf77977f46a3b..a7faae523294a5a8636a0e0c36573f62b9a5b1fb 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -3,7 +3,7 @@
     name: distribution-csit-userfeatures
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit4-1node-{functionality}-{install}-carbon'
+      - '{project}-csit4-1node-{functionality}-{install}-nitrogen'
 
     # The project name
     project: 'distribution'

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index d7a3b7e0d1fc30fe2d5803df7a9eacd1e131a1ef..7a6345f074fd4fa4ade0d9b4e9069f7d87faa077 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -359,12 +359,12 @@
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
 
-# Delete these when Karaf 4 becomes Carbon default.
+# Delete these when Karaf 4 becomes Nitrogen default.
 
 # TODO: Is there a way to de-duplicate with generic template parts?
 
 - job-template:
-    name: 'distribution4-check-carbon'
+    name: 'distribution3-check-nitrogen'
     disabled: false
 
     project-type: freestyle
@@ -380,11 +380,11 @@
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: stable/carbon
-          refspec: refs/heads/stable/carbon
+          branch: master
+          refspec: refs/heads/master
           artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
       - maven-exec:
           maven-version: mvn33
 
@@ -392,7 +392,7 @@
       - integration-gerrit-scm:
           basedir: distribution
           refspec: '$GERRIT_REFSPEC'
-          branch: stable/carbon
+          branch: master
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -407,7 +407,7 @@
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
           project: '{project}'
-          branch: 'stable/carbon'
+          branch: 'master'
           files: '**'
 
     builders:
@@ -443,7 +443,7 @@
           maven-version: 'mvn33'
 
 - job-template:
-    name: 'distribution4-deploy-carbon'
+    name: 'distribution3-deploy-nitrogen'
     disabled: false
 
     project-type: freestyle
@@ -458,17 +458,17 @@
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts} **/*.hprof'
       - integration-distribution-branch:
-          branch: 'stable/carbon'
+          branch: 'master'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -488,7 +488,7 @@
           maven-version: 'mvn33'
 
 - job-template:
-    name: 'distribution4-offline-carbon'
+    name: 'distribution3-offline-nitrogen'
     disabled: false
 
     project-type: freestyle
@@ -503,17 +503,17 @@
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts} **/*.hprof'
       - integration-distribution-branch:
-          branch: 'stable/carbon'
+          branch: 'master'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
 
     wrappers:
       - opendaylight-infra-wrappers:

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index b564431c69ea922b15b572dc9340fd397197709c..17712cca77a9157f568a2fdcc11655534c1cf29a 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -91,12 +91,12 @@
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
 
-# Delete these when Karaf 4 becomes Carbon default.
+# Delete these when Karaf 4 becomes Nitrogen default.
 
 # TODO: Is there a way to de-duplicate with generic template parts?
 
 - job-template:
-    name: '{project-name}-distribution4-check-carbon'
+    name: '{project-name}-distribution3-check-nitrogen'
     disabled: false
 
     project-type: freestyle
@@ -112,13 +112,13 @@
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
       - maven-exec:
           maven-version: mvn33
 
@@ -128,7 +128,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
       - integration-distribution-scm:
-          branch: 'stable/carbon'
+          branch: 'master'
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -143,7 +143,7 @@
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
           project: '{project}'
-          branch: 'stable/carbon'
+          branch: 'master'
           files: '**'
 
     builders:

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 9c58a98d5a848cf427e9aa68aa8daec727efb37e..057e71ce5d63d2851cd9e8fcc664506a2154aea0 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -13,9 +13,9 @@
       - 'distribution-deploy-{stream}'
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
-      - 'distribution4-deploy-carbon'
-      - 'distribution4-offline-carbon'
-      - 'distribution4-check-carbon'
+      - 'distribution3-deploy-nitrogen'
+      - 'distribution3-offline-nitrogen'
+      - 'distribution3-check-nitrogen'
 
     project: integration/distribution
     project-name: distribution

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 3ebdc7d55a36b42b7adfaa944c6d2382adec756c..bee3932227ff6c7b798c6ab6b940a2e8c8aaa430 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -189,6 +189,8 @@
     parameters:
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     builders:
       - trigger-builds:
@@ -219,13 +221,16 @@
     parameters:
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     builders:
       - trigger-builds:
           - project: '{csit-sanity-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
@@ -451,6 +456,8 @@
     parameters:
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     triggers:
       - timed: '{schedule-weekly}'
@@ -459,8 +466,9 @@
       - trigger-builds:
           - project: '{csit-weekly-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
@@ -480,8 +488,8 @@
     parameters:
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     triggers:
       - timed: '{schedule-high-frequency}'
@@ -490,8 +498,9 @@
       - trigger-builds:
           - project: '{csit-high-frequency-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:

diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml
index b8ca58cd8d38ae4ab361f275b200f0823aba656c..3591d82bf77f846e66281e73994ab85a393e1369 100644 (file)
--- a/jjb/integration/integration4-templates.yaml
+++ b/jjb/integration/integration4-templates.yaml
@@ -1,6 +1,6 @@
 ---
 - job-template:
-    name: '{project}-csit4-1node-{functionality}-{install}-carbon'
+    name: '{project}-csit4-1node-{functionality}-{install}-nitrogen'
     # Keep synchronized with *-csit-* please.
     disabled: false
 
@@ -12,16 +12,17 @@
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
+      # Removing {kafka-version} will force this job to run in k4.
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: 'integration/test'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
-          branch: 'stable/carbon'
+          branch: 'master'
       - integration-distribution-stream:
-          stream: 'carbon'
+          stream: 'nitrogen'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - integration-controller-scope:
@@ -31,15 +32,13 @@
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-stream-test-plan:
-          stream-test-plan: '{project}-{functionality}-carbon.txt'
+          stream-test-plan: '{project}-{functionality}-nitrogen.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: 'openjdk8'
-      - distribution-karaf-version:
-          karaf-version: karaf4
 
     scm:
       - integration-gerrit-scm:
@@ -86,7 +85,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-carbon-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-nitrogen-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -100,7 +99,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-carbon-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-nitrogen-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index b69daa0f9c7910c6f3da97d6d04d1c720ef74ae5..166a85a8b7f31640142bfc9d2dfff0d16c1e47e3 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       # TODO uncomment this line when IoTDM added to Carbon

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index a63e1e46c38571ce71944c9a99ed6dcd72479a4d..0dd6f35d6b0d683d35b89e35f3f82a8a563a2e61 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -36,7 +37,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index dfdeebce7c3b6618b46ff89618e5344b6d6d2985..83a935f3eae14a546a7e7d68e754737c81001bc0 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 02269be4ef1de684997fd1c1a4a53cd7fa66eabe..2ed9868a9cf6bb1d0eb6bb56e7b152c8aa62ce37 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -32,7 +33,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 5ac926ed61c83433a0273b5370a3d8f052966b5c..b73996b0e43d7ad195f5f0aff74fa287cfda7ec8 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index d4db1a5b29cc87330a6a6a1e15baf77719eb69b2..f717d6a9f226757a413b2acece4d5e2d48beed0f 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index e5c7bb2d75d65506d960bc0aa290b105ad496c9b..59e13535d5b01efd64fa61d546fb427d8c1c11e1 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 5c28e9ae9989e014c4009c697efa483dda66ebc2..d39b71b0f19bf04f3503af474e9c46b7724c043b 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 5dec7553cff2478f7061b4cabb7512eeaa26e80f..aeaa6bf468bc96db7496dd985dcc2724832b1b69 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 8a29a5066a0312013dcecd3659b0fc0ba0cfeb30..b61bd457f5e55a4537feafe125e9fc499a679d47 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index e9941c209bdf754111131a5722550d368a4da4e0..e2a79df84bd021e23b47dd5ae738e32ba114bdf3 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -37,7 +38,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 94e6cab88856aa246e8e9218948fd97cb650d937..4f44276fe95d323933628be23f36b4d6db825fa6 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -32,7 +33,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 22b31f3ace8343b8df7cb1ea9be692a9064d0453..b34994c21dc9a0f9a14a4014bacc45fcada430ed 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index d01ee081daa7e347628d22e8d420f9c5a0cda3dd..3ec53dc2e9ff8244f788f67bfa9f5be2116571ee 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 65e1bada21efe37bf9e8eb192f21e988548a6115..7a766aefba43ba27f5ac19ca1fe8058819a4dbaf 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 55704240683c8351dc77dea6be2fbcb186467b45..7076499bd90d133452dfc71bcf7d313acef69b44 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -32,7 +33,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 5aa4e5c0613e701bb09f39080974cdaf3f432893..d78a9bef35fa936baf09c8b7a700c496a97917e6 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 5671a7231e9b0649cacbbbd61b68f4ec3c776cd6..9485b8bb10691a28ff4bd9f83cfd969f9832657b 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 59be99d40d60f5bf62edbcc1f1b7b25c3e7365da..084bb62740843cbed2162f98a96507696531d8af 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -35,7 +36,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 52247b8ce29e84527c234ac7ef0ee717e8c82543..bc243cd2fc4cf4967408c9d3ee3cc608cee19fbc 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 77c9b5bd38284078741e17c3aac852e9efb2a7fe..4157f74d39e507b2e184aa36ebd24954d9a42a86 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 054c973879befa1afa754ca1a664655124dd8715..73ef1eed08880ce53485f1793fa0cb74eea0a092 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index b82ec9851d534545b8083363a62964e7ceb4aa73..2c32dfe76eb87b053abf885cd601ec3e3eb954f7 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 2601fee5ed1c6874a694d267de1837fff5bb9380..13ca70d9c37d06c160ea06d98e807923b8beb37e 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 47021f45b2e27553fee4fca8f6bd211cb8863321..44ddc07f249e9a1fe3387f448a172daa473d7987 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index f77e4ab8298fc741b8c3eda324c3baefee6364b9..3cf225219fcbc433a5351b8dd3ab13a74653fa72 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       # remove nitrogen validate job until SNMP4SDN is back in nitrogen
@@ -32,7 +33,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 86b12f343e7ab4812ffc67e6313fc76b60b03cb4..32152e1dddd66d203171512ac2f04895eb3e2686 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index fa72c749e678c0f4db0bc15f450c6d8309c390f3..7ac5137e08155d3120ff422687d27c37396a14f5 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 1b357c77fa326a404c29c7a6e7ee363a347796c9..b8e5cd3c8a02cd96112f609407742494a3524a80 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index e2a549fe1336ab5fa045d535cb74244457ae2fb6..5a9d13f93138e3d7357f9a7303b1ad7a2aa93c79 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 12b55668c1eda981e936ee1c2e3ba6e941fa6988..d0df6b98d213f783e1b2ce2cef6f029b326447a1 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 9e965381da82f1616d34dccf48cc988d3bcf286a..7798961f115a961b266d3940248182d39c395166 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 8be32ffae8d9fe1c586ac847e5341f1ae1ac3a39..67ce4ac85131fb448d1b6f90f6424bb0c795a0d0 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index a564d0457ca69050ce2d5645827479ed7a12896a..bf46dcc81f852b1cfeb4a0a48c1bd520914cb887 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -35,7 +36,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index ee4b308e7e9e0795c3a521d5df20b715c708a870..d839cb7b9275b863e2e6c1f0aa2d648fa7842dc7 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 7e652a52069b17f591ee948446459f447286f0d4..4aeeea1478272594db0a067bb1178f70e02842d5 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'