From a18261a3fc9b605f796b648511c859df86742f51 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Tue, 13 Jun 2017 15:19:54 +0200 Subject: [PATCH] Bug 8625: Remove Nitrogen Karaf 3 jobs All jobs related to Karaf 3 in Nitrogen should be removed, as TSC voted on not spending any cycles on Karaf 3 in Nitrogen. Karaf 4 is the new default for CSIT in Nitrogen, so it is expected some jobs start failing for projects not fully working on Karaf 4. Change-Id: Iae504c2acf6576f15cffa7f91b4cdcb37599ddbe Signed-off-by: Vratko Polak --- jjb/aaa/aaa.yaml | 1 - jjb/alto/alto.yaml | 1 - jjb/atrium/atrium.yaml | 1 - jjb/bgpcep/bgpcep.yaml | 1 - jjb/bier/bier.yaml | 1 - jjb/capwap/capwap.yaml | 1 - jjb/cardinal/cardinal.yaml | 1 - jjb/centinel/centinel.yaml | 1 - jjb/controller/controller.yaml | 1 - jjb/didm/didm.yaml | 1 - jjb/dlux/dlux.yaml | 1 - jjb/dluxapps/dluxapps.yaml | 1 - jjb/eman/eman.yaml | 1 - jjb/faas/faas.yaml | 1 - jjb/federation/federation.yaml | 1 - jjb/genius/genius.yaml | 1 - jjb/groupbasedpolicy/groupbasedpolicy.yaml | 1 - jjb/honeycomb/vbd/vbd.yaml | 1 - jjb/infrautils/infrautils.yaml | 1 - .../distribution-csit-userfeatures.yaml | 1 - .../distribution/distribution-jobs.yaml | 170 ------------------ .../distribution/distribution-templates.yaml | 89 --------- .../distribution/distribution.yaml | 3 - jjb/integration/integration-templates.yaml | 2 +- jjb/integration/integration-test-jobs.yaml | 1 - jjb/iotdm/iotdm.yaml | 1 - jjb/l2switch/l2switch.yaml | 1 - jjb/lacp/lacp.yaml | 1 - jjb/mdsal/mdsal.yaml | 1 - .../messaging4transport.yaml | 1 - jjb/natapp/natapp.yaml | 1 - jjb/nemo/nemo.yaml | 1 - jjb/netconf/netconf.yaml | 1 - jjb/netide/netide.yaml | 1 - jjb/netvirt/netvirt.yaml | 1 - jjb/neutron/neutron.yaml | 1 - jjb/next/next.yaml | 1 - jjb/nic/nic.yaml | 1 - jjb/ocpplugin/ocpplugin.yaml | 1 - jjb/odlparent/odlparent.yaml | 1 - jjb/of-config/of-config.yaml | 1 - jjb/openflowjava/openflowjava.yaml | 1 - jjb/openflowplugin/openflowplugin.yaml | 1 - jjb/ovsdb/ovsdb.yaml | 1 - jjb/packetcable/packetcable.yaml | 1 - jjb/releng-defaults.yaml | 4 - jjb/sdninterfaceapp/sdninterfaceapp.yaml | 1 - jjb/sfc/sfc.yaml | 1 - jjb/snbi/snbi.yaml | 1 - jjb/snmp/snmp.yaml | 1 - jjb/snmp4sdn/snmp4sdn.yaml | 1 - jjb/sxp/sxp.yaml | 1 - jjb/topoprocessing/topoprocessing.yaml | 1 - jjb/tsdr/tsdr.yaml | 1 - jjb/ttp/ttp.yaml | 1 - jjb/unimgr/unimgr.yaml | 1 - jjb/usc/usc.yaml | 1 - jjb/usecplugin/usecplugin.yaml | 1 - jjb/vtn/vtn.yaml | 1 - jjb/yang-push/yang-push.yaml | 1 - jjb/yangtools/yangtools.yaml | 1 - 61 files changed, 1 insertion(+), 323 deletions(-) diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 9dd3e0e92e..fac77a518c 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -4,7 +4,6 @@ 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}' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index a9fabc5b0e..c33dbc79c1 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 86845c4865..0e3d822fb3 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index ef84d305b6..df86c660e5 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index a9f3ed414a..c03dac7777 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index aa65a2b0dc..20211a4c31 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index ff26b85e3d..48516638be 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 5ee8641859..514f10051f 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index eccabd913f..d1d416c00f 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -4,7 +4,6 @@ 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}' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index 2ffad8e6d3..25e69bc5bd 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index b755662831..a935ace484 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 06101fda2a..92bc0160ca 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 86d6b0f26d..24fd71583b 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 2d4108de7c..413a20203d 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index dcf8d3bb9b..ca2435825f 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -7,7 +7,6 @@ - '{project-name}-merge-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - '{project-name}-distribution-check-{stream}' - - '{project-name}-distribution3-check-nitrogen' project: 'federation' project-name: 'federation' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 2d37e1daf6..b51abe8f58 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index ad33be53bb..ee38719a64 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index dc79a808ac..a85060f15f 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 3dbe8caa10..2cbed833ae 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index e9141edda8..e596eabe38 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -3,7 +3,6 @@ name: distribution-csit-userfeatures jobs: - '{project}-csit-1node-{functionality}-{install}-{stream}' - - '{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 6f94ff1f66..cb8a411368 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -353,173 +353,3 @@ email-prefix: '[int/dist]' - integration-csit-archive-build - lf-infra-publish - -# Delete these when Karaf 4 becomes Nitrogen default. - -# TODO: Is there a way to de-duplicate with generic template parts? - -- job-template: - name: 'distribution3-check-nitrogen' - disabled: false - - project-type: freestyle - node: '{build-node}' - concurrent: true - jdk: '{jdk}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: master - refspec: refs/heads/master - artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt' - - distribution-karaf-version: - karaf-version: karaf3 - - maven-exec: - maven-version: mvn33 - - scm: - - integration-gerrit-scm: - basedir: distribution - refspec: '$GERRIT_REFSPEC' - branch: master - - wrappers: - - opendaylight-infra-wrappers: - # Distro-check jobs typically run within 10 - 30 minutes - # with 45 minutes being the occassional edge case. - # enforce a 60 minute limit to ensure stuck jobs get - # cleared up sooner. - # Double that as Karaf 3+4 may take longer. - build-timeout: '120' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: 'master' - files: '**' - - builders: - - distribution-check-wipe - - distribution-check-build-project: - pom: 'distribution/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' - - distribution-check-verify-groupid: - gerrit-project: 'integration' - - distribution-check-delete-snapshots - - distribution-check-configure-remotes - - distribution-check-repeat-build: - dist-pom: 'distribution/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' - - integration-upload-distribution: - dist-pom: distribution/pom.xml - - integration-distribution-check - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[{project-name}]' - - postbuildscript: - builders: - - shell: | - #!/bin/bash - mkdir -p $WORKSPACE/archives - cp karaf*.log $WORKSPACE/archives - script-only-if-succeeded: false - script-only-if-failed: false - mark-unstable-if-failed: true - - lf-infra-publish - -- job-template: - name: 'distribution3-deploy-nitrogen' - disabled: false - - project-type: freestyle - node: centos7-java-builder-2c-8g - concurrent: false - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: 'master' - refspec: 'refs/heads/master' - artifacts: '{archive-artifacts} **/*.hprof' - - integration-distribution-branch: - branch: 'master' - - integration-bundle-url: - bundle-url: '{bundle-url}' - - integration-jdk-version: - jdkversion: '{jre}' - - distribution-karaf-version: - karaf-version: karaf3 - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}. - - builders: - - distribution-deploy-verify - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[int/dist]' - - integration-csit-archive-build - - lf-infra-publish - -- job-template: - name: 'distribution3-offline-nitrogen' - disabled: false - - project-type: freestyle - node: centos7-java-builder-2c-8g - concurrent: false - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - branch: 'master' - refspec: 'refs/heads/master' - artifacts: '{archive-artifacts} **/*.hprof' - - integration-distribution-branch: - branch: 'master' - - integration-bundle-url: - bundle-url: '{bundle-url}' - - integration-jdk-version: - jdkversion: '{jre}' - - distribution-karaf-version: - karaf-version: karaf3 - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}. - - builders: - - distribution-deploy-offline - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[int/dist]' - - integration-csit-archive-build - - lf-infra-publish diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index 8bc61f681d..11aeb60b41 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -89,92 +89,3 @@ script-only-if-failed: false mark-unstable-if-failed: true - lf-infra-publish - -# 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}-distribution3-check-nitrogen' - disabled: false - - project-type: freestyle - node: '{build-node}' - concurrent: true - jdk: '{jdk}' - - properties: - - opendaylight-infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' - project: '{project}' - 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: karaf3 - - maven-exec: - maven-version: mvn33 - - scm: - - integration-gerrit-scm: - basedir: '$GERRIT_PROJECT' - refspec: '$GERRIT_REFSPEC' - branch: '$GERRIT_BRANCH' - - integration-distribution-scm: - branch: 'master' - - wrappers: - - opendaylight-infra-wrappers: - # Distro-check jobs typically run within 10 - 30 minutes - # with 45 minutes being the occassional edge case. - # enforce a 60 minute limit to ensure stuck jobs get - # cleared up sooner. - # Double that as Karaf 3+4 may take longer. - build-timeout: '120' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: 'master' - files: '**' - - builders: - - distribution-check-wipe - - distribution-check-build-project: - pom: '$GERRIT_PROJECT/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' - - distribution-check-verify-groupid: - gerrit-project: '$GERRIT_PROJECT' - - distribution-check-download-deps: - dist-pom: 'distribution/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' - - distribution-check-delete-snapshots - - distribution-check-configure-remotes - - distribution-check-repeat-build: - dist-pom: 'distribution/pom.xml' - mvn-opts: '{opendaylight-infra-mvn-opts}' - - integration-upload-distribution: - dist-pom: distribution/pom.xml - - integration-distribution-check - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[{project-name}]' - - postbuildscript: - builders: - - shell: | - #!/bin/bash - mkdir -p $WORKSPACE/archives - cp karaf*.log $WORKSPACE/archives - script-only-if-succeeded: false - script-only-if-failed: false - mark-unstable-if-failed: true - - lf-infra-publish diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index 991fdb5814..0504f748a4 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -12,9 +12,6 @@ - 'distribution-deploy-{stream}' - 'distribution-offline-{stream}' - 'distribution-check-{stream}' - - 'distribution3-deploy-nitrogen' - - 'distribution3-offline-nitrogen' - - 'distribution3-check-nitrogen' project: integration/distribution project-name: distribution diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index f98ced42fd..47c11a99d7 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1363,7 +1363,7 @@ - integration-distribution-branch: branch: '{branch}' - distribution-karaf-version: - karaf-version: 'karaf3' + karaf-version: '{karaf-version}' - integration-distribution-git-url: git-url: '{git-url}' - string: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 122d48ff5f..904ae14c7e 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -18,7 +18,6 @@ stream: - nitrogen: branch: 'master' - karaf-version: karaf3 jre: 'openjdk8' csit-list: '{csit-list-nitrogen}' csit-sanity-list: '{csit-sanity-list-nitrogen}' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 56189018a5..7e2976cc63 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 1765436be5..9950e0a931 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 818ef82717..dd1233505b 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 56dd790d8e..f5b197b599 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -4,7 +4,6 @@ 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}' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 208c8faa64..77b1bb7943 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 589fc4ecca..0099f203d7 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index febcaf8cc7..200136113b 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 75ba7e4c08..232ea9a5a4 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -4,7 +4,6 @@ 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}' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index ad690cff3a..2b6acdfa68 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 8447fe1c17..a3b511dae4 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 5a5495cbcf..233abe0a47 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 846749614c..dc0d3392d0 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index c2792e7902..8b1a393cbe 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 822dba4de2..4f8e7e28a5 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index f20bf18a92..11bbb7ba8f 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -4,7 +4,6 @@ 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}' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 4efaf92c51..30a5df714b 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index ebc94a3c01..abefc27b0a 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 26b7bcea6a..7ae1a4d985 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index a2334748cb..12798dde4e 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 863fc7e277..ed449e6d5b 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index b366575ce0..94c5b1381e 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -180,8 +180,6 @@ bgpcep-csit-3node-bgpclustering-longevity-only-carbon, distribution-deploy-carbon, distribution-offline-carbon, - distribution4-deploy-carbon, - distribution4-offline-carbon, openflowplugin-csit-1node-periodic-longevity-only-carbon csit-weekly-list-boron: > distribution-deploy-boron, @@ -237,8 +235,6 @@ didm-csit-1node-discovery-only-nitrogen, distribution-csit-1node-userfeatures-all-nitrogen, distribution-csit-1node-userfeatures-only-nitrogen, - distribution-csit4-1node-userfeatures-all-nitrogen, - distribution-csit4-1node-userfeatures-only-nitrogen, dluxapps-csit-1node-yangman-all-nitrogen, dluxapps-csit-1node-yangman-only-nitrogen, genius-csit-1node-upstream-all-nitrogen, diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 1e9e201e09..fe73b3e3cd 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 4bb8b33d6b..0a4baa87fe 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 780627cb29..01bcf83ed6 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index bf6c7a908f..49917a3374 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index f09e0a3eb6..7c03df5c1e 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index f8b36f4f95..53970cbd39 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index aae68caa23..e083fda07d 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 287e09c260..f90dfd8ee3 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 09dbd05f4c..e2435af9f3 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 5ea350fcce..af3b5ba1a3 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 6e7fc68351..cb766b8a8a 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index ca9bdc896e..68a997c37e 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 76dbdd619c..61e48d628a 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 7cbfdd8846..b8ddd851c7 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -4,7 +4,6 @@ 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}-verify-{stream}-{maven}-{jdks}' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index e14bce5bf4..7a44277af1 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -4,7 +4,6 @@ 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}' -- 2.36.6