From 4257de5ee09bf10ace62f248eda0e0b812d9b42f Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 3 May 2018 22:13:22 +1000 Subject: [PATCH] Remove sfc carbon jobs Change-Id: Ie1cb6062997949d45b85a71b8e62d2aad831af8d Signed-off-by: Anil Belur --- jjb/sfc/sfc-csit-full-deploy.yaml | 3 --- jjb/sfc/sfc-csit-rest-basic.yaml | 3 --- jjb/sfc/sfc-patch-test.yaml | 3 --- jjb/sfc/sfc-python.yaml | 2 -- jjb/sfc/sfc.yaml | 20 -------------------- 5 files changed, 31 deletions(-) diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index c050efa8c..d9d576e42 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.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/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index a0dc38318..e6be93e35 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.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/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index d3da13233..0d155f72f 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -15,9 +15,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 feature: - basic: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 331afd100..54ea866be 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -11,8 +11,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' project: 'sfc' project-name: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index ab58e449b..75d1bd250 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -58,26 +58,6 @@ # Used by the release job staging-profile-id: a68eb361ca48a -- project: - name: sfc-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'sfc' - project-name: 'sfc' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' - email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: a68eb361ca48a - - project: name: sfc-sonar jobs: -- 2.36.6