Remove lithium jobs

Now that Boron has been officially released we can remove all the
Lithium jobs from our CI system.

Change-Id: I6978a7f97e1bf1381ce236222c72a72e614a2452
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 2870b2401387ae576ffbf8866a799844efad8641..e0066f3ad9ca27a01e3168107608e8b0e2d3e05b 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index 3558d90de08c7664bd704967a4207a9c0bb62e73..8a477ad1839a55737ca6ba89f0d07ec1bde0854e 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 5de7c822696a130e9cf812983bb0c5d3bda96246..2910fc458ff98f1cdcb9023761e93749a73490d4 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -103,41 +103,6 @@
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
-- project:
-    name: aaa-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
 - project:
     name: aaa-sonar
     jobs:

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index e943ef5b009ec2d3c420b2aeb301c5d2d2406cbb..e94ed2163e8618203c7d0835a6679fdfee60cf7a 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index c1a7286d9485dd11257037a5efa91e01a2aa2263..fce3c8328431d298ac83602c0a65bfa1a192b4c4 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -104,41 +104,6 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
-- project:
-    name: alto-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
-
 - project:
     name: alto-sonar
     jobs:

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 4fd8d70ea317f28814d28c54d3d7d70a394eb4f1..a1d34bb0d4ffe39ae7dde0e323426771cad4085d 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -22,11 +22,6 @@
         branch: 'stable/beryllium'
         jdk: 'openjdk7'
         integration-test: beryllium
-    - lithium:
-        next-release-tag: Lithium-SR5
-        branch: 'stable/lithium'
-        jdk: 'openjdk7'
-        integration-test: stable-lithium
 
     project: 'releng/autorelease'
     archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index ba4cd6c7e69528eeeee30e758d9e62626dfc88ff..405e7f19e4766d8ea47feeea45b5da4553dea5f9 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
@@ -64,9 +61,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 536b29a7079f1916369d71a2d1953de599a95991..b11f953d84b3a273390960eae856d8e804c57606 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index fd78b28d05d364cf50aaa37eebe16c96e2a38623..45497959fd7d2c34e64305245e7bdbc635ae0388 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 94e867beacbb01d17bff4aba9d321ec70309f5e9..c64377e91b7eb68c6ea723590a3948f6bb2e2afc 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml
index 551e0395dbad5324604b80ac135e3bf8dfefbe28..128dbb3fee557bbdefb1601cfb7caf2ff7427989 100644 (file)
--- a/jjb/bgpcep/bgpcep-pcepy.yaml
+++ b/jjb/bgpcep/bgpcep-pcepy.yaml
@@ -12,8 +12,6 @@
             branch: 'stable/boron'
         - beryllium:
             branch: 'stable/beryllium'
-        - stable-lithium:
-            branch: 'stable/lithium'
 
     toxdir: 'pcep/pcepy'
     project: 'bgpcep'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 2b5e91b4dbda706003cc0efd36da4e24da855be2..7bd3ae1d5801dd204b62673d410cb89f1ae48ef4 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -108,43 +108,6 @@
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
 
-- project:
-    name: bgpcep-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    build-node: centos7-java-builder-4c-8g
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
-
 - project:
     name: bgpcep-sonar
     jobs:

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 7300bce14799ce02bc1c9d8a42da2e60439aeba6..d52ad4ea055eb75bd10f7618b2ca6983b85eaeee 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 91c4eddd8445bff4f3a95227154e57f989d84cc1..cd35bad16e067374c3f1b403a62b49b8ed708dc6 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -104,41 +104,6 @@
     email-upstream: '[capwap]'
     archive-artifacts: ''
 
-- project:
-    name: capwap-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-    archive-artifacts: ''
-
 - project:
     name: capwap
     jobs:

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index d7f754c7f17bc946ca2cedcc1f386aa5256b635a..3aebba377ba1a1ca4ac91bb66e5863a576254def 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/controller/controller-csit-clustering-lithium.yaml b/jjb/controller/controller-csit-clustering-lithium.yaml
deleted file mode 100644 (file)
index 8dfdf9f..0000000
--- a/jjb/controller/controller-csit-clustering-lithium.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-- project:
-    name: controller-csit-clustering-lithium
-    jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'controller'
-
-    # The functionality under test
-    functionality: 'clustering'
-
-    # Project branches
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-        # Bug 4676 means -all- would fail.
-
-    # No tools system VMs needed in JCloud configuration
-    mininet-vms: 0
-
-    # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        integration-distribution-merge-{stream}

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 2cc5dc8251b46ab3d9a788a1c4c23dcc791e59f2..b982aef7ffb8b196f1897dfff4ff9bf7d044a5e2 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index e2b1932ce26a4516b10563923fefeadceb9e731e..c0252a7af13ff80c336f1573b56aa03db462c60c 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 0010fffbad8bb5a525745747c26890473d29ae12..57803dfd522d2aa2fd46ee6ab4394b4724c13c29 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -104,42 +104,6 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: controller-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
-
 - project:
     name: controller-sonar
     jobs:

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index a1af2d55f29016d10b8fd3222084f8f4f4ad3008..a31a321f40a2c3f362c63698506e51fa357d8a4d 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -103,41 +103,6 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
-- project:
-    name: coretutorials-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    archive-artifacts: ''
-
 - project:
     name: coretutorials-sonar
     jobs:

diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
index d2720f81689ed73575ce3b124c01cee445b58e43..7976732a1cc63fc17f6a669444e6a9379237f36c 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 0bea1c97d0e74a36ef2fc72a0621ddf7998e669f..e441b5aa861766905522250a3bbd54a571093026 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[didm]'
     archive-artifacts: ''
 
-- project:
-    name: didm-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-    archive-artifacts: ''
-
 - project:
     name: didm-sonar
     jobs:

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 843bb757244af89a05b9c58408106200ced3d237..9b8f0ef1e7fd02ddb16033b3fb5401e5e6a3d35d 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[dlux] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: dlux-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: dlux-sonar
     jobs:

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index 57207d9d9b931df41d90e0c1ca25281a1d1c2c2b..806df16ff7369ac4bbd1fbf4232970a981d03337 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[docs] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: docs-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'docs'
-    project-name: 'docs'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'docs-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[docs] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: docs-sonar
     jobs:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 7f146a27355f709f8ccedcd2506da2b913fd32c6..05a4b4097a496d69b58d962042743b185c1c7fcc 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 4b9d9680d9bfc6bb890a4be2da2ba9c30a831c52..cbbd85ee637750c1dbfd73a5e06d8a2e3e530aa8 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 2833c06092a4f0e604d3a698ca4ad0188adc8513..c29e5dc3c171f97be707299d5245d0de258c7595 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index af279be96934cd47bd469547294afa411f6429be..b642999888f55695b8e0e6c3584c53573811886d 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
-- project:
-    name: groupbasedpolicy-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    archive-artifacts: ''
-
 - project:
     name: groupbasedpolicy-sonar
     jobs:

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 7689729d1e4ffd3978a2b0a1bc58da3c483aa146..b479d7456417750d0ebede72e05dcf8e7e590657 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
 
 - job-template:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 8f082fbac508bf4a9bf253db5b5c2386163333e2..205314d55062cf9da5cb71a86b55afc3ab0cf743 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -170,48 +170,6 @@
                 vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
 
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: 'openjdk7'
-            jre: 'openjdk7'
-            csit-list: >
-                aaa-csit-1node-authn-only-{stream},
-                aaa-csit-1node-authn-all-{stream},
-                bgpcep-csit-1node-userfeatures-only-{stream},
-                bgpcep-csit-1node-userfeatures-all-{stream},
-                capwap-csit-1node-ac-only-{stream},
-                capwap-csit-1node-ac-all-{stream},
-                controller-csit-3node-clustering-only-{stream},
-                integration-distribution-offline-{stream},
-                l2switch-csit-1node-switch-only-{stream},
-                l2switch-csit-1node-switch-all-{stream},
-                l2switch-csit-1node-scalability-only-{stream},
-                l2switch-csit-1node-scalability-all-{stream},
-                lispflowmapping-csit-1node-all-only-{stream},
-                lispflowmapping-csit-1node-all-all-{stream},
-                netconf-csit-1node-userfeatures-all-{stream},
-                netconf-csit-1node-userfeatures-only-{stream},
-                netvirt-csit-1node-openstack-basic-only-{stream},
-                netvirt-csit-1node-openstack-basic-all-{stream},
-                nic-csit-1node-basic-all-{stream},
-                nic-csit-1node-basic-only-{stream},
-                openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-all-{stream},
-                openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-only-{stream},
-                ovsdb-csit-1node-southbound-only-{stream},
-                ovsdb-csit-1node-southbound-all-{stream},
-                snmp-csit-1node-basic-only-{stream},
-                snmp-csit-1node-basic-all-{stream},
-                usc-csit-1node-channel-only-{stream},
-                usc-csit-1node-channel-all-{stream},
-                vpnservice-csit-1node-vpnservice-only-{stream},
-                vpnservice-csit-1node-vpnservice-all-{stream},
-                vtn-csit-1node-manager-li-only-{stream},
-                vtn-csit-1node-manager-li-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream}
-
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 36d0ed742ed5b3566b84b2727d44e0f8b06b593e..bbd76c277a8dc167e043057ce97de2e116fbfb7a 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 2a05241d2a4dfcc5ac6a6e36c22173e8131f0df2..d715ce755231ec1dd6ddda834cb3065f0753057a 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -98,38 +98,6 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: iotdm-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
-
 - project:
     name: iotdm-sonar
     jobs:

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index 571843202e45f29bfec3eb962df08a4f80300169..f486df6024c4226bf7a79baf400cedfebe7c566c 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index 131fbea00c139fe251b9f035a4bf936bad1525b5..ff12542b521a454a5481a04d85bb8237ae504839 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 2e8bbd71f8b6c4749c894f32c7f561815349b8e4..3b36a14522a31e7fb4b43a460fa33b8a17206828 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 96cbacb91583a745571a04e2d647bb7cccf8afd3..cede29eda98c9a956255957d3515d4baea97a532 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: l2switch-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
-
 - project:
     name: l2switch-sonar
     jobs:

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index c2e1c4b507ae78e4e81f8b8b8b32e2a19a61945c..7874dd4083d89d8241c0fbd98e032e6d2858c29d 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index da994a30d24e9016ce5f09928d28689745bae4fd..fbf946375fe2608425d933a3991992bc615ab360 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: lacp-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    mvn-settings: 'lacp-settings'
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
-
 - project:
     name: lacp-sonar
     jobs:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
deleted file mode 100644 (file)
index b29048e..0000000
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-- project:
-    name: lispflowmapping-csit-all-stable-lithium
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'lispflowmapping'
-
-    # The functionality under test
-    functionality: 'all'
-
-    # Project branches
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-lispflowmapping-all,odl-restconf,odl-mdsal-apidocs'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},neutron-distribution-{stream},lispflowmapping-distribution-{stream}'

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 8334732a9091334cda5f33f822313a1c1c2e77d1..014190cebb5d71be144f453f2ea6f7004a8326cf 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -101,39 +101,6 @@
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
 
-- project:
-    name: lispflowmapping-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-8g
-
 - project:
     name: lispflowmapping-sonar
     jobs:

diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
deleted file mode 100644 (file)
index 200452c..0000000
--- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-- project:
-    name: mdsal-csit-periodic-dsbenchmark-lithium
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'mdsal'
-
-    # The functionality under test
-    functionality: 'dsbenchmark'
-
-    # Project branches
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-dsbenchmark-impl'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Performance by structure'
-    01-plot-yaxis: 'Average total time [ms]'
-    01-plot-group: 'MD-SAL Data Store Performance'
-    01-plot-data-file: 'perf_per_struct.csv'
-    02-plot-title: 'Performance by operations'
-    02-plot-yaxis: 'Average total time [ms]'
-    02-plot-group: 'MD-SAL Data Store Performance'
-    02-plot-data-file: 'perf_per_ops.csv'
-

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index b1f9b481972ba1545bc61b9775a84d6a77a7631d..d4ec07fbb403f91e82eff9b704ec14235bcc0748 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 93f1cdb6be2129b4f4a37462497b22de98b5adea..51ca4f3ce01b6761daf44d1de3ac93ff175404f4 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/netvirt/netvirt-csit-clustering.yaml b/jjb/netvirt/netvirt-csit-clustering.yaml
index b5ce68817ac83e158d6be6243cd20dc9bca7bcb4..1b9f891f0532a56991697361e73da18f4c3e6798 100644 (file)
--- a/jjb/netvirt/netvirt-csit-clustering.yaml
+++ b/jjb/netvirt/netvirt-csit-clustering.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/netvirt/netvirt-csit.yaml b/jjb/netvirt/netvirt-csit.yaml
index 51c0a5648f3d6b09a856baade29309d1add3e8f7..4b11e10b60f402e693382d600dfe951b2fb96f6d 100644 (file)
--- a/jjb/netvirt/netvirt-csit.yaml
+++ b/jjb/netvirt/netvirt-csit.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 631efc8ff611d029507c95e2333dbb84331f2992..59b8c8aea53049f21bbd68f30cdd66cfc0c3b210 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -98,38 +98,6 @@
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: neutron-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
-
 - project:
     name: neutron-sonar
     jobs:

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 636fe17879588ccb429125cfb34d158dfec58a2c..3e2fec7ba933cd5d3abee5693e75a6d3ab9c4330 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 79855c405bff29d9cc2352d0b4379dbe75b7b45c..16bf3c78622af680c2d1483a762c8aaea3acf412 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index e0f7887d892f0bd2ca12e24a4ec17164205f41dc..610b433ba5c851c018f35cb8b8d5ea631aa0e5e8 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
-- project:
-    name: nic-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
-
 - project:
     name: nic-sonar
     jobs:

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 2b82b6814e927a1ff2bf4dfac3eacca7e4361b1b..c157d14dd93e448d1b297b6f54d3cc1bdc28d3df 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -104,42 +104,6 @@
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
-# ODL Releng build templates
-- project:
-    name: odlparent-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: odlparent-sonar
     jobs:

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index c5e43a9852f22938f23d0f87fa0b2598ea92d7aa..12c33b7bf16dd25595550ce35ebcc009fe1b3cb8 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -99,38 +99,6 @@
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
-- project:
-    name: openflowjava-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'openflowjava-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
 - project:
     name: openflowjava-sonar
     jobs:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml
index 3d2300d2e6f72e0f07cc420e0c3de6e813b869cb..4b96c6b89f2ad396b57eae5252a9578d9016f90d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
index d31e5ec23c72b1521279f87f2003b3af7d72b01b..de59d6fc2b85c1bfa8ea79d00d8547cf350f592f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
index 285c7aabe84b7625abde5010c88b0a8d4832eca9..2ae81adbba97dc03f48cba1dc9e95b3d433027a7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
index baf14a29bd5209d28b46f902ba8b7dfbfe148fb2..d4c2e22a41249fa27c6cf25e68d741bf8d2fb04d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
index 580a5afc86222d0e55b6fc43cbe8f7522b4b876c..26090e6a5f59ae866f2f5dca2753564d5fec5662 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
index e6d06b4d6fd72db6c7171c78053697c9d4698029..9369afefc2ac2b30df05a992ab87ba9dd548b92b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml
index cb45da9bbbed8d9abb5853157991e2704f90dfbb..f186ba60bf790e67cb2d5b0c7848cc32157bf624 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
@@ -30,4 +27,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
index 1d9d608defa5e5bbc393b07730d770337b52248e..99091cfed75e7a35c2cbec930822b6ab183a8b66 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
@@ -30,4 +27,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml
index 4489bf9ba35a7061b4e227d9f73122e462ca5230..8f349d87a09273bd60f241bd7364d9975f8f25e2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
@@ -40,4 +37,3 @@
     02-plot-yaxis: 'seconds'
     02-plot-group: 'Stats Collect Performance'
     02-plot-data-file: 'times.csv'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
index e520f952f7ea82991614582b36eed2c1433f5105..829aaeec787b8ab735ff07cce2014caac8ee899a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
@@ -40,4 +37,3 @@
     02-plot-yaxis: 'seconds'
     02-plot-group: 'Stats Collect Performance'
     02-plot-data-file: 'times.csv'
-

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml
index 4f1f50f7c1ac60e3c5bae201e7d98c9ccdd04210..00f01f5efccb57f00d4b27a73cf84a537e2a2dad 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
index 884e824b5957ec3c122b28aa04309b9f90b8e94b..19985f2a05d5147f381fb45c0e033902c5c91744 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml
index 535cac552d1cc95f279d86557e164d8fadfefb44..d2cc97b626e21b63268ae46a06d5ce66618388dd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
index 98991e9c412e3eef7af38f96145e9c28c7a1f17f..3431514b24dde66f2e9ab0bc3f16ce7d28941c40 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml
index 89117f00162ac9350e4cb5e3ee6e5bb36b5ad506..52f9794e9855490c9c08282bec42488eca38c6f3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
index a388f8ffc4c48541ba4bc78092c64b43be629042..5d7c7d92bd241b9a6006045313b107eac7c363d1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
index 5cb7fe9365d3de6a06f8c03acd9f988433d176d9..e81006b22d3bbabcb437e304a69815084746050a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml
index e8c9fa9f16f09f723c2d0716402b45fafd92b9e7..2f9a5ef92d468056b96c13b0e3313c267e459f35 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml
index e142ac758738f5d1494835ab5cdfb3adb84c1bc5..0b9aac663b2f69a255a686be9702e703f6ce314c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
index ae41822b2b6a569a12d525cf81ab5f6bdd641d31..8e702b6b9d902bd6ba659374fcb232fb0894a574 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml
index b0d242cdbd1e4bfa5b583199be8ffa325534a38b..076bfd75d76b7d3c377db4c1397b1e8695b3189c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
index 4cc6e2d366dc0d92fe40684f93757804e524494f..2a2854b819f2b42398c8b1e7e41cd7da159042ea 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml
index 50cfe2ab29794ba45b47fb3010c18c828d7563ce..6c706b37e6350ca379422a78d9cb3feb4ac39000 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
index b7110c043b2058c72a4bb8262126ec28e9835778..53c4d574b56088b37a78c8390497b9ffbd355afd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
@@ -14,9 +14,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index bb5766648b94808f7f3a914f79d4faa9191db016..27e4e37ff8f108565322cdee750d8510e0182070 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -98,38 +98,6 @@
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
 
-- project:
-    name: openflowplugin-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
-
 - project:
     name: openflowplugin-sonar
     jobs:

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 9282deddc588617a7f20b1123f7e5fedb5c14a8f..fffaad026ab9a666e28d85cbd258c4e6314a85ac 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
index 9cfc0c3a8eeef921ae139cceac756b49a72d8212..01deef60a5211a24499503927895af7a17d780bb 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
+++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index f3f999a36469e1e772231e90d5d726fb963dbef8..5aa9a8af99ecf9cb58fc3be153e4daf7cc77f09d 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 52cd8fc9548bc85b10039fe0685e389029008cf5..7fe777dc112598a2fdee7bbd338eb3345020bc4a 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -21,11 +21,6 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'ovsdb'
     archive-artifacts: '*.log'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 8819ff998ec4c44db7e2b58fae8db8fdbd425531..428425aa153b8c5a8de24a0abd6c8f76501f5029 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -103,38 +103,3 @@
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
-
-- project:
-    name: ovsdb-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''

diff --git a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml b/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
deleted file mode 100644 (file)
index 677a03e..0000000
--- a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: packetcable-csit-pcmm-stable-lithium
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'packetcable'
-
-    # The functionality under test
-    functionality: 'pcmm'
-
-    # Project branches
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-packetcable-policy-server'
-
-    # Robot custom options
-    robot-options: '-v ODL_VERSION:lithium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        packetcable-distribution-merge-{stream}

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 82267a6c29727d15bc51057d3a672bd0eb6a4180..a73ac969361b144a72a01144bfbd86e4b9161de5 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
-- project:
-    name: packetcable-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
-    archive-artifacts: ''
-
 - project:
     name: packetcable-sonar
     jobs:

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index f6f04f725aba3d44391860c995a07f313b71ec88..531ee28e84136f78a0a827734507bdcfa1372797 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -100,38 +100,6 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
-- project:
-    name: persistence-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[persistence]'
-    archive-artifacts: ''
-
 - project:
     name: persistence-sonar
     jobs:

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index d1e1b93e02ccba98b2f438ed0ba60a2727c64214..26f1a3741b81a3fa2a18562df3d1897bdcda63f9 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
-- project:
-    name: reservation-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[reservation]'
-    archive-artifacts: ''
-
 - project:
     name: reservation-sonar
     jobs:

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 0114bdb78bb341a9da9f907ad87436256d4cce7c..31a1a1d467fa76249666e6a176afb71c8d3dd71d 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -98,38 +98,6 @@
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
-- project:
-    name: sdninterfaceapp-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
-
 - project:
     name: sdninterfaceapp-sonar
     jobs:

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 40c180b5f16bfcae92b6cabf0a7fe9ab623f2310..8eb15b68874358adfb15e04ef93f571511838635 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -99,37 +99,6 @@
     email-upstream: '[snbi]'
     archive-artifacts: ''
 
-- project:
-    name: snbi-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-    archive-artifacts: ''
-
 - project:
     name: snbi-sonar
     jobs:

diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml
index d776758d2e9ea7c9c1a67d17dad5b87b6575580b..d0ba1ca0d859df13a9caf64abb9955330bdf0939 100644 (file)
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 92a2e93ad631f303f4996722ef825e906e4ae918..527ca9a638a186113bd711a9a683059ac21324d8 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -98,38 +98,6 @@
     email-upstream: '[snmp] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: snmp-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: snmp-sonar
     jobs:

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 7efa7de5ce1ced87c2ffb6a023bb4e3fe02ba41e..74fb6a8e6eba871879b863fbec77860744bfb96c 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: snmp4sdn-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: snmp4sdn-sonar
     jobs:

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index e184c6b646c22218f60372e60c926db615ce8334..076daab658d7df9191909f6120e9d45e60208eae 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 3156356791ccf95cd1bf5993e2cce557aad92ece..19e7206c5c6ceace25079f344b85e35d2212f8c0 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -20,9 +20,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 9b71f8e0be3be012f930498f2938a47abea1605c..46df7cfc3938c30689f0e5d5550659da8e73261d 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: sxp-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: sxp-sonar
     jobs:

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 21d9ddc11c1cbcf4f08916bec7b2c94011a86371..fbaeb0699b89ab42ef3472b40b190d764a5827aa 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -100,38 +100,6 @@
     email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
-- project:
-    name: tcpmd5-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'tcpmd5'
-    project-name: 'tcpmd5'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'tcpmd5-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
 - project:
     name: tcpmd5-sonar
     jobs:

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index f678b81eb55ccdbc61b68b791987537f0439544e..83547537cc73a249d1161d2f06736039e50ced85 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -102,39 +102,6 @@
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-
-- project:
-    name: topoprocessing-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: topoprocessing-sonar
     jobs:

diff --git a/jjb/tsdr/tsdr-csit-hbase-lithium.yaml b/jjb/tsdr/tsdr-csit-hbase-lithium.yaml
deleted file mode 100644 (file)
index 3cfa948..0000000
--- a/jjb/tsdr/tsdr-csit-hbase-lithium.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: tsdr-csit-hbase-lithium
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'tsdr'
-
-    # The functionality under test to verify
-    functionality: 'hbase-datastore-lithium'
-
-    # Project branches
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-tsdr-hbase'
-
-    # Robot custom options
-    robot-options: '-v ODL_VERSION:stable-lithium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'

diff --git a/jjb/tsdr/tsdr-csit-hsqldb-lithium.yaml b/jjb/tsdr/tsdr-csit-hsqldb-lithium.yaml
deleted file mode 100644 (file)
index 9890f05..0000000
--- a/jjb/tsdr/tsdr-csit-hsqldb-lithium.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: tsdr-csit-hsqldb-lithium
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'tsdr'
-
-    # The functionality under test to verify
-    functionality: 'hsqldb-datastore-lithium'
-
-    # Project branches
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-tsdr-all'
-
-    # Robot custom options
-    robot-options: '-v ODL_VERSION:stable-lithium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 8d7a7c70958bf35f9dbea3a17578e0652b8f1926..29370953915526319606ed91921013d09f292ae4 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
-- project:
-    name: tsdr-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
-    archive-artifacts: ''
-
 - project:
     name: tsdr-sonar
     jobs:

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 2552a8004c3448273dc2f8c245c06d413f197778..3206832a3aff8ebd744f01c39d997c5a8ae92631 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -98,37 +98,6 @@
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: ttp-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: ttp-sonar
     jobs:

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 723d998c173ee13b34a6e0d1abe647dff6f8fd07..d31b4ad3e7ce7999424b8cfaa684bbd4ad735c5b 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 07251d07c9e71dd3e0327897a750b90fcbfbdf42..a117d2835fbf0946a1a7ef5dd4043a9d46b5f27c 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index bfba955a7665718bcb7d07899db9ceee1cc8e8b9..e48a52662848612b2633d705cc03acddb6553ad3 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -98,39 +98,6 @@
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: usc-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/lithium'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: usc-sonar
     jobs:

diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index b60525bb32aa34c3d41bc0220488ecb01c7bc1ac..1f627567b233ffd12de5b4dc07301fcac03fb3a2 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 381a86e9d888b662e4ca60ed7cb7a8f400cc90ab..799942d8b917faab1ebf0ea2d7295b7e21bf0b55 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -101,38 +101,6 @@
     email-upstream: '[vpnservice] [openflowplugin] [neutron]'
     archive-artifacts: ''
 
-- project:
-    name: vpnservice-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'vpnservice'
-    project-name: 'vpnservice'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'vpnservice-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[vpnservice] [openflowplugin] [neutron]'
-    archive-artifacts: ''
-
 - project:
     name: vpnservice-sonar
     jobs:

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 9a0365d90eda38ee15a4d9ade294037323148429..f1480d61c289c431c467d6244d73481f6229c688 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -21,9 +21,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml b/jjb/vtn/vtn-csit-manager-stable-lithium.yaml
deleted file mode 100644 (file)
index e5f5b88..0000000
--- a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-- project:
-    name: vtn-csit-manager-li
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'vtn'
-
-    # The functionality under test
-    functionality: 'manager-li'
-
-    # Project branches
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index f990a5d178bc813816e26bb4da3a66b222114659..f16dab708866c3970eeffffb891b82b95d6c9481 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -114,44 +114,6 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
-- project:
-    name: vtn-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
-
-    # Please do not archive maven sites!!!
-    # Maven sites are published to Nexus at:
-    # https://nexus.opendaylight.org/content/sites/site/
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
-
 - project:
     name: vtn-sonar
     jobs:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 1aff468cf1fb1fb4ddaa129e43ead9ffc6263294..6c86c05dcf6db16d1990fa63f7751530fa693519 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -108,42 +108,6 @@
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: yangtools-stable-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn31:
-            mvn-version: '{mvn31}'
-        - mvn32:
-            mvn-version: '{mvn32}'
-    mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: yangtools-sonar
     jobs: