From dd28d242e12282f838c89264b2edbf34fb1b9c97 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 3 May 2018 22:17:47 +1000 Subject: [PATCH] Remove sxp carbon jobs Change-Id: I2b9f7f1794a45d75c0416f1f22075318e93a5522 Signed-off-by: Anil Belur --- jjb/sxp/sxp-csit-basic.yaml | 3 --- jjb/sxp/sxp-csit-cluster-routing.yaml | 4 ---- jjb/sxp/sxp-csit-clustering.yaml | 3 --- jjb/sxp/sxp-csit-filtering.yaml | 3 --- jjb/sxp/sxp-csit-performance.yaml | 3 --- jjb/sxp/sxp-csit-topology.yaml | 3 --- jjb/sxp/sxp.yaml | 19 ------------------- 7 files changed, 38 deletions(-) diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 32f2fea771..b6656a02cd 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index d7b95d23c3..a54a2f697a 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -21,10 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route' install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 7404e0b81c..2013f744b0 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 1c18ccd314..2314008f8d 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 954ab23cab..cb63fe7b3b 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 28abaf89d3..4b0ab51c7b 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index e3bb0b8768..9d661fad5a 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a6909c75719b7 -- project: - name: sxp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'sxp' - project-name: 'sxp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a6909c75719b7 - - project: name: sxp-sonar jobs: -- 2.36.6