From: Daniel Farrell Date: Wed, 9 May 2018 09:38:45 +0000 (+0000) Subject: Merge "Remove controller carbon jobs." X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bac2762e11d9541ad171cd6867a40a06da25041b;hp=ff591e654f3fe97bc10588b473a6f87297463717;p=releng%2Fbuilder.git Merge "Remove controller carbon jobs." --- diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index eb580fda5..74f10a059 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -17,9 +17,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 23ffa331c..5123bc388 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index a6bd7ac4d..5cff7f2cb 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index a5130abf9..541a5dcd5 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 88a8e0c12..3d0d69887 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index a95fdb06c..a11f40642 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 1743f1b1a..156522b5f 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index e79ebef99..cb0ade8ab 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 41169c5ac..f64faedde 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 344ebb88f..6edd88909 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 0c2b0fdfd..25ae25545 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 6cf7ecfea..616bee0ee 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 025a9e9a7..ed072791d 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -64,28 +64,6 @@ # Used by the release job staging-profile-id: 96c1c9177efdd -- project: - name: controller-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'controller' - project-name: 'controller' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'controller-settings' - mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - build-node: centos7-builder-8c-8g - build-timeout: 90 - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' - email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - - # Used by the release job - staging-profile-id: 96c1c9177efdd - - project: name: controller-sonar jobs: