Remove controller carbon jobs.

Change-Id: I2fe2d11fd91154aeb9570f4f3f8fe5f47e0f8e15
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index eb580fda54e04d67b1ae7b065ea2ad6dbda4354d..74f10a05999651faa5ab3f63e727b9d45e8b6316 100644 (file)
--- 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 23ffa331c93e34f33487d29ccfe5da99049b58b9..5123bc3884446853d97ab12edcb1296761cbce47 100644 (file)
--- 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 a6bd7ac4d1543d8c6e70da791cdcd0b0d0bcf5b3..5cff7f2cba21878e91a544636791aaa5adf2c116 100644 (file)
--- 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 a5130abf9e8c8450fe87e3f6edb13b1bbad54419..541a5dcd57616c4465b5182382e354c939fdbeba 100644 (file)
--- 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 88a8e0c12bc2028f896dbd30f380438ebe5d9640..3d0d698879f7cbba3a7abbb87879c33e794e23cb 100644 (file)
--- 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 a95fdb06ca81346577aa4e926f701d59c4d0a3c5..a11f406427766618fcf2b046a1773e50556a22a8 100644 (file)
--- 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 1743f1b1a9b1066fc6caeb168c8e535a232e6136..156522b5faca43faf34ace936545262af71b09ee 100644 (file)
--- 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 e79ebef997eca6e4fda445c19989e90310a82767..cb0ade8ab8a80583e9131d3efce90a5841a5259f 100644 (file)
--- 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 41169c5ac3635068703a31d0e923a82dff67ea3a..f64faeddee20f51b7bd18d8fdffad30207c20492 100644 (file)
--- 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 344ebb88f777fe7e39866ccf1c8271b463f55db5..6edd8890945e39b1c7f7f2ab19935342a724a496 100644 (file)
--- 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 0c2b0fdfd27b826f851b7e5fc7dcf5cf5c07c43c..25ae2554579379e773955b474cbe6a90b88ea736 100644 (file)
--- 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 6cf7ecfeaf6ec650756cdfe04deb6cc4bab8c813..616bee0eebfd5a86d79bc1905fd2b5b141111290 100644 (file)
--- 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 025a9e9a75d4b54d612dca89ba3fec384d73e7c2..ed072791dddcb0bb7284e633261eb45403e77963 100644 (file)
--- 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: