From: Luis Gomez Date: Fri, 12 May 2017 00:12:48 +0000 (-0700) Subject: Adjust for karaf 4 not happening in carbon X-Git-Tag: release/carbon~38^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0bf45db1d8c9fc32027bf75acf67861244d1e30a;hp=56a299dcf7a355402b69bdaf2470243e7c0202d0;p=releng%2Fbuilder.git 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 --- diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 010cc886d..137b7ff43 100644 --- 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 99e2fe1d3..8615853d1 100644 --- 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 fd36010d1..f216efb5c 100644 --- 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 f7792a3a9..65fe3a3d8 100644 --- 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 12ad1076a..f8383a8b8 100644 --- 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 a99c63d1a..139bff0e8 100644 --- 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 95a20a7cf..f1d3fb98c 100644 --- 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 fcbbae62b..4ac5b1b5a 100644 --- 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 185482da2..8d1679134 100644 --- 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 a6f1188fa..97d50d454 100644 --- 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 00b31dc66..30568d2f1 100644 --- 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 aaaf1e7c3..df544b9f7 100644 --- 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 d581efe2e..7ae21fed1 100644 --- 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 cef10f4ed..ead4febb2 100644 --- 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 789356b9d..6d8aede2c 100644 --- 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 5682d12e2..50659e146 100644 --- 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 6b5b7805d..5df803714 100644 --- 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 2e8f863db..a8729cee5 100644 --- 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 97a2d5f67..004da6b48 100644 --- 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 e1f68aca9..a7faae523 100644 --- 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 d7a3b7e0d..7a6345f07 100644 --- 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 b564431c6..17712cca7 100644 --- 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 9c58a98d5..057e71ce5 100644 --- 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 3ebdc7d55..bee393222 100644 --- 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 b8ca58cd8..3591d82bf 100644 --- 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 b69daa0f9..166a85a8b 100644 --- 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 a63e1e46c..0dd6f35d6 100644 --- 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 dfdeebce7..83a935f3e 100644 --- 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 02269be4e..2ed9868a9 100644 --- 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 5ac926ed6..b73996b0e 100644 --- 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 d4db1a5b2..f717d6a9f 100644 --- 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 e5c7bb2d7..59e13535d 100644 --- 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 5c28e9ae9..d39b71b0f 100644 --- 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 5dec7553c..aeaa6bf46 100644 --- 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 8a29a5066..b61bd457f 100644 --- 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 e9941c209..e2a79df84 100644 --- 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 94e6cab88..4f44276fe 100644 --- 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 22b31f3ac..b34994c21 100644 --- 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 d01ee081d..3ec53dc2e 100644 --- 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 65e1bada2..7a766aefb 100644 --- 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 557042406..7076499bd 100644 --- 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 5aa4e5c06..d78a9bef3 100644 --- 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 5671a7231..9485b8bb1 100644 --- 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 59be99d40..084bb6274 100644 --- 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 52247b8ce..bc243cd2f 100644 --- 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 77c9b5bd3..4157f74d3 100644 --- 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 054c97387..73ef1eed0 100644 --- 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 b82ec9851..2c32dfe76 100644 --- 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 2601fee5e..13ca70d9c 100644 --- 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 47021f45b..44ddc07f2 100644 --- 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 f77e4ab82..3cf225219 100644 --- 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 86b12f343..32152e1dd 100644 --- 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 fa72c749e..7ac5137e0 100644 --- 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 1b357c77f..b8e5cd3c8 100644 --- 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 e2a549fe1..5a9d13f93 100644 --- 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 12b55668c..d0df6b98d 100644 --- 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 9e965381d..7798961f1 100644 --- 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 8be32ffae..67ce4ac85 100644 --- 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 a564d0457..bf46dcc81 100644 --- 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 ee4b308e7..d839cb7b9 100644 --- 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 7e652a520..4aeeea147 100644 --- 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}'