Remove unsupported Beryllium jobs

Since Carbon has been officially released Beryllium is no longer
supported so remove the jobs.

Change-Id: Iaef265dc8dbc1bc7be87a0b0bed56bb84cf77c25
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 7e9c1c2b4dd7bb73bd926f90aaecc223ab8b20f7..61074842ab8211cd8bbef39987116d8de0406de1 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml
index b9b99b998998fb76f4907e7185fcfff9346ba674..e4dfde64a00089a9aa8723910a82c6e71875d950 100644 (file)
--- a/jjb/aaa/aaa-csit-idmlite.yaml
+++ b/jjb/aaa/aaa-csit-idmlite.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 137b7ff43e7f07955c857ed1b0c183db1fbe0350..9dd3e0e92ee66de5c1936c952445f8d84ce46ffa 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -83,34 +83,6 @@
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
-- project:
-    name: aaa-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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 5042a631608cdb92f3f69f9fa7aeaec7fc01667b..a09aedd89304a7b9cede498187178c6b13d29049 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 8615853d10801b973b256b082f675f724f546e6a..e89f8654b2472fbb9b6aedc21fbfba00cf519fba 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
-- project:
-    name: alto-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 85b83efe28243c3d113533362866ca1e0677dd52..c63482519199f375c042d76f47167ccfca1de33c 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -79,33 +79,6 @@
     email-upstream: '[armoury]'
     archive-artifacts: ''
 
-- project:
-    name: armoury-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'armoury'
-    project-name: 'armoury'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'armoury-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: ''
-    email-upstream: '[armoury]'
-    archive-artifacts: ''
-
 - project:
     name: armoury-sonar
     jobs:

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 288209521f886aeb5d185b97201354e90ad60e41..a56546875c8f4fe832b95624751458f8f9de9467 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -47,18 +47,14 @@
     name: autorelease-determine-merge-order
     builders:
       - shell: |
-          # TODO: Remove this condition once stable/beryllium is no longer
-          #       officially maintained.
-          if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then
-              virtualenv --system-site-packages $WORKSPACE/venv
-              source $WORKSPACE/venv/bin/activate
-              pip install --upgrade pip
-              pip install --upgrade networkx
-              pip freeze
-              ./scripts/determine-merge-order.py
-              deactivate
-              rm -rf $WORKSPACE/venv
-          fi
+          virtualenv --system-site-packages $WORKSPACE/venv
+          source $WORKSPACE/venv/bin/activate
+          pip install --upgrade pip
+          pip install --upgrade networkx
+          pip freeze
+          ./scripts/determine-merge-order.py
+          deactivate
+          rm -rf $WORKSPACE/venv
 
 - builder:
     name: autorelease-maven-deploy

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index c00cfb15c6e6e138382877cb36b822d9bc3a26af..293b6c60f4d3fb3e4653318b325095a0ecc9ad40 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -25,14 +25,6 @@
           jdk: 'openjdk8'
           integration-test: boron
           karaf-version: karaf3
-      - beryllium:
-          # Only run once a week since Beryllium is in maintenance mode
-          cron: 'H H * * 0'
-          next-release-tag: Beryllium-SR5
-          branch: 'stable/beryllium'
-          jdk: 'openjdk7'
-          integration-test: beryllium
-          karaf-version: karaf3
 
     project: 'releng/autorelease'
     archive-artifacts: >

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 6a63da2c891d19f163a12dc57c73f047e42fe77c..22cda72e9947e30ad16a59ed42245a897d5843cf 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -38,25 +38,6 @@
               -v REPETITIONS_CHANGE_COUNT_MANY:10
               -v MULTIPLICITY_CHANGE_COUNT_MANY:600
               -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-data-change-counter,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-netconf-connector-all
-          robot-options: >
-              -v USE_NETCONF_CONNECTOR:True
-              -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10
-              -v REPETITIONS_CHANGE_COUNT_SINGLE:3
-              -v CHECK_PERIOD_PREFIX_COUNT_MANY:10
-              -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0
-              -v REPETITIONS_CHANGE_COUNT_MANY:10
-              -v MULTIPLICITY_CHANGE_COUNT_MANY:600
-              -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     install:
       - only:
@@ -123,24 +104,6 @@
               -v PREFILL:10
               -v UPDATE:single
               -v TEST_DURATION_MULTIPLIER:4
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-data-change-counter,
-              odl-netconf-connector-all
-          robot-options: >
-              -v USE_NETCONF_CONNECTOR:True
-              -v COUNT:1000000
-              -v INSERT:10
-              -v WITHDRAW:9
-              -v PREFILL:10
-              -v UPDATE:single
-              -v TEST_DURATION_MULTIPLIER:4
 
     install:
       - only:

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 4091f0f639cd337de58519fc5d28466e138994fa..e33a0115349eb658e60ecb6ea03ced1ae4117c97 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -24,11 +24,6 @@
           jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-clustered-topology'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-clustered-topology'
 
     install:
       - only:

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 106977fffa830a7c6cb866d8d56df3f391bd0256..1a3580fa35a0f37a04f6f0db92d9763311ce7dc6 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -24,11 +24,6 @@
           jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep'
 
     install:
       - only:

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index db797632280082a4691cd0d35ee83706b6d51bb2..325969803b808258ad84f22d96046b640addfe27 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -34,20 +34,6 @@
               odl-bgpcep-bmp,
               odl-jolokia
           robot-options: '-v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-pcep-all,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-pcep,
-              odl-netconf-connector-all,
-              odl-bgpcep-bmp,
-              odl-jolokia
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     install:
       - only:

diff --git a/jjb/bgpcep/bgpcep-pcepy.yaml b/jjb/bgpcep/bgpcep-pcepy.yaml
index fa5f963c1b9941cb7bde0f94bd703e5922c51504..780ca7050efa2e8311f37b27b8a26f97a0d38a7a 100644 (file)
--- a/jjb/bgpcep/bgpcep-pcepy.yaml
+++ b/jjb/bgpcep/bgpcep-pcepy.yaml
@@ -8,8 +8,6 @@
       # Pcepy was removed in Carbon.
       - boron:
           branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
 
     toxdir: 'pcep/pcepy'
     project: 'bgpcep'

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 65fe3a3d85e47288ac918ab32fa859f4f8829a45..3904535b563ab78acd71c51f4fe295ca7f3af36f 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -101,42 +101,6 @@
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
-
-- project:
-    name: bgpcep-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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: ''
-    build-node: centos7-java-builder-4c-8g
-
 - project:
     name: bgpcep-sonar
     jobs:

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 62294a9451fc0e23bba81c0914debb86a6f97be8..dd8982ace72338cbdfa2b464d3ebe5caa8df07d0 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 139bff0e8e4860fbf1a20fc974e1192463cf4c36..e12a336b7f9845e846b51bff8f77454b295f42fb 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[capwap]'
     archive-artifacts: ''
 
-- project:
-    name: capwap-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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 ed02d51247e6f5857078cebc6fb27e9a0ac11103..9393f90475471dfcc0a46bf0359959440848dc97 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 4ac5b1b5a89cd4a6b68e2c3ada8ad3459a66c66d..3578774d5f3de2248fa0725d8430cfd19c62ff09 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[centinel]'
     archive-artifacts: ''
 
-- project:
-    name: centinel-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-    archive-artifacts: ''
-
 - project:
     name: centinel-sonar
     jobs:

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 4bb7e8f2d6000d649329e6fb90a25ec62899c43c..7ab56420f132f1ccbba27ec741361297a2d4f0ec 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 8778cf5f32e30e5075bd4b4f0741f48023126f3b..c7812c37d6b28525a41c9f86a24fbd8ea8ceafeb 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index af7ff6109449746401fb951094ae56eb5c049672..123704450004694b6237319dfc3d3eb6c151ba17 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 13f7e0be762d8c887c56c2c2e2f4efffe070fb3c..8dc7c6492da776da99950b7a7cf09c35ff835716 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 09869279379f2dd1cc8190c7912d60711f0cac50..ab43f6f7aaa43e8f1f296a1e0b733445551b812a 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     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 8710a4602bf3a035d75cd6db96df0a52621dc397..1d540ac7bc74fa1a2854e376f345fa8f1560c890 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 8d1679134a7ef33fe83dd34fe05d234da59430be..eccabd913f4a91caec1844ac8a6067650966a219 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: controller-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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 367ca6e7f8d66f2a07f7260e854a5117048e8e15..cd47f88a7a377633f52eb321e225dd80fd884346 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -76,32 +76,6 @@
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
-- project:
-    name: coretutorials-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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 615ce277b5ea9b2eea4e6ba52b0d99c2e71625ab..a580e0e405876a3d87c53c5cbac262a0503bf6cf 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 97d50d454805a4746a86ac014dc88dfdca26a96c..40456efc9118c1ad21568ea9df587492602f3b51 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[didm]'
     archive-artifacts: ''
 
-- project:
-    name: didm-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index b770c2150a1b0283613795003f5cf91e95729984..25dc63a15a572cbf4cd08350d38aaf11ab377583 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -76,32 +76,6 @@
     email-upstream: '[discovery]'
     archive-artifacts: ''
 
-- project:
-    name: discovery-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'discovery'
-    project-name: 'discovery'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'discovery-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[discovery]'
-    archive-artifacts: ''
-
 - project:
     name: discovery-sonar
     jobs:

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 30568d2f1366e50e274f803823980ff77c585397..35ae5506b8b50ce268ab5002cf565481577caefc 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[dlux] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: dlux-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'dlux'
-    project-name: 'dlux'
-    karaf-version: karaf3
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 3fd3f3ce263fb676a2d6860e2476f2f7de4481d1..6efd20c8d5595a6ec778e55deee89bd2636e439d 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -14,8 +14,6 @@
           branch: 'stable/carbon'
       - boron:
           branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
 
     project: docs
     project-name: docs

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
deleted file mode 100644 (file)
index c1eaeaf..0000000
--- a/jjb/docs/docs.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- project:
-    name: docs-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'docs'
-    project-name: 'docs'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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:
-      - '{project-name}-sonar'
-    project: 'docs'
-    project-name: 'docs'
-    branch: 'master'
-    mvn-settings: 'docs-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index ead4febb2d054465ba362937b6112dc2f5b21531..22464bc009ae4e219b2475064ece0ec7fac073e3 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[faas]'
     archive-artifacts: ''
 
-- project:
-    name: faas-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-    archive-artifacts: ''
-
 - project:
     name: faas-sonar
     jobs:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 1f598940fa10007d71bf9f95bbc4568bdaad8b16..6b428fce658eb7757595836ba370ce3a4c9f27e2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -33,11 +33,6 @@
           jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
 
     openstack:
       - newton:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 1572c351122858c2ca4b4c32d5eee4a3efd45f0b..4c1f1d26b9f9da0cb7e29817a2cb7b8c457427a9 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index bf8b007676309729e345a084672d0b9a19233c46..b919c85a3f7d2cbaefc494b51407dc7edab603e0 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index c69f567062a8ca2ec17a784d280ff8ecece07e2b..407b8a4b39eec0388d43bd23e6289eae8958f1ed 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 5df80371467eae3e3b9085ab6c874a4559f9e7fa..775e870e114da1b4520ca14d79ecc2ee3bb8acf7 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -98,40 +98,6 @@
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
-- project:
-    name: groupbasedpolicy-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index a7faae523294a5a8636a0e0c36573f62b9a5b1fb..e9141edda8817dfd8d957585cb0527c92b6a07c8 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -26,12 +26,6 @@
           karaf-version: karaf3
           install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
           robot-options: '-v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     # TODO: Add Beryllium when everything is backported there.
 

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 057e71ce5d63d2851cd9e8fcc664506a2154aea0..95bde7137f02243e67f60e42c797d11396ea39b6 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -36,6 +36,3 @@
       - boron:
           branch: stable/boron
           karaf-version: karaf3
-      - beryllium:
-          branch: stable/beryllium
-          karaf-version: karaf3

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 75719880084a0d32bd329fa40aced5a38287e299..aa9372312796e61e2f1877e62b6c33b3f8aa0c29 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -51,18 +51,6 @@
           csit-high-frequency-list: ''
           schedule-high-frequency: ''
 
-      - beryllium:
-          branch: 'stable/beryllium'
-          karaf-version: karaf3
-          jdk: 'openjdk7'
-          jre: 'openjdk7'
-          csit-list: '{csit-list-beryllium}'
-          csit-sanity-list: ''
-          csit-weekly-list: ''
-          schedule-weekly: 'H 12 * * 0'
-          csit-high-frequency-list: ''
-          schedule-high-frequency: ''
-
     # tools system image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
 

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 5c81767b215811ffb8967f3c827aa0fb45fcf56d..fd95fe56da062a1d8fc1ead45e840607cbdb5a90 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: iotdm-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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 2d14a29de80b62f6934c26b10c2492d72bb65718..65f36f3bd774356d4b0f36b4b292245b171573c8 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index bb1fe3955f915de72cbd0639e141013c373fc2ad..09e1051e18c2aa181bd16cfa79b65b062fc0a868 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index e899f68b8d9e03998df71c8d743e1e9e5d2870fe..f7c429d5cadd993a4a12392547cccd21a3fa9791 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 5bd174ee1f640d35ee14f1d7cd13436a82e74dcf..bc670259facd279970b68dea30bff26cb1c69556 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -20,10 +20,6 @@
           branch: 'stable/boron'
           jdk: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: 'openjdk7'
-          karaf-version: karaf3
 
     feature:
       - all:

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 0dd6f35d6b0d683d35b89e35f3f82a8a563a2e61..6880ff7c2f9bdec5c8582d13de0a7dbc63e73265 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -98,40 +98,6 @@
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: l2switch-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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 db0539a769ab98ed046ea6239253b198d167faed..82a0606c96268cb23cc8b5be111e992687222d26 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 83a935f3eae14a546a7e7d68e754737c81001bc0..e6dbe368042633c20238d24e342464231cb0e463 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: lacp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 018ea27a32c53633d8002293436ae1958a39a259..7939eca4edf94233231e2fa91114e5fdf02f7e97 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -25,10 +25,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index 3d1f1ae4b6eb44cef4793cdc916b23ff0dea06d7..32e42cd963c4dfe0b0bb82962e5f811f1ac7f34a 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 2ed9868a9cf6bb1d0eb6bb56e7b152c8aa62ce37..231a07d3cf40ec2d89c94cf2ee55d6647a47acd0 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -86,36 +86,6 @@
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
 
-- project:
-    name: lispflowmapping-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index f2987c5f8ba24a0adee2905dd42cd13ad6d2efe4..22f9ea8745e556059bcbc959a8ccbf8a22bda268 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -25,11 +25,6 @@
           jre: 'openjdk8'
           karaf-version: karaf3
           robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_7_OPTIONS:-Xmx6144m@-XX:MaxPermSize=512m --escape space:@'
 
     install:
       - only:

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index b73996b0e43d7ad195f5f0aff74fa287cfda7ec8..56dd790d8e09074a28157816108d5b0f377b054c 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: mdsal-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: mdsal-sonar
     jobs:

diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
index a2b2009b309ae71bd51c5b28f34ebe35f47937ee..8017793965e14c36e7d5c56298e728b7cc88ea03 100644 (file)
--- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index f717d6a9f226757a413b2acece4d5e2d48beed0f..c803def5d11ad7c0809c46804041619b9ca85152 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
-- project:
-    name: messaging4transport-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
-
 - project:
     name: messaging4transport-sonar
     jobs:

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index d48097dfd9344934c989136b027f2f013a195cfb..250277f1011f40192ce9592844e9b1a20088c032 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index d39b71b0f19bf04f3503af474e9c46b7724c043b..40ebc7e20f2cf727d41d8a6e074d5a67be3cbce6 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
-- project:
-    name: nemo-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[nemo]'
-    archive-artifacts: ''
-
 - project:
     name: nemo-sonar
     jobs:

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 1347af9cefd56ac75c04d252ad97a9ccc0bb8538..46b1935368d8a0c7207192fd667e7119afb3334a 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 429f207e5c0bf742404901b0bbb74c2940ea571a..6bc1e94c1574624b0e86c6a448a7b1c6fce01fc8 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 4c7763258d7f8c8953449bc9b377f6d3902b6975..7ea02b322b9f82c74f932ee3e7b2d074f8e92cab 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -30,17 +30,6 @@
               odl-netconf-connector-all,
               odl-netconf-topology
           robot-options: '-v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-clustering-test-app,
-              odl-netconf-mdsal,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     install:
       - only:

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 2b4c903d40e5019eb9b80635e5cfd8c8a602381c..811c8450fa54dd291034a00bb9721ade2ecf2cd7 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -32,18 +32,6 @@
               odl-netconf-connector-all,
               odl-netconf-topology
           robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-netconf-mdsal,
-              odl-mdsal-apidocs,
-              odl-clustering-test-app,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
 
     install:
       - only:

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index aeaa6bf468bc96db7496dd985dcc2724832b1b69..75ba7e4c08fac2d8fa85c74030785b4e0caf6898 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: netconf-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: netconf-sonar
     jobs:

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index 26f190b87781545f04c8cfb14c2e44e33eea4e3a..365c36f639edb7df12cf09d4497b304fb0b6e1a1 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index b61bd457f5e55a4537feafe125e9fc499a679d47..c5e63d5da6ca31d4a52f0d08efd24224c6d56553 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
-- project:
-    name: netide-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
-
 - project:
     name: netide-sonar
     jobs:

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index c2665f0dcee1e138fab8b09d66889308b81cc750..7898183a2263178d7352fedb0d287d8dd88cab9e 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -20,12 +20,6 @@
           jdks:
             - openjdk8
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'

diff --git a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
index 7390064d9db0fdb9d91a3b0101004a4a71e4b1c7..b9f23fc7f7d38a20f0e3a880a22d98326b8223df 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
@@ -17,10 +17,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
index e72b2ade41ca51ca913d5315588327b25e5961f9..ac29d69c4668b3b40faacd4f4c3f3333d2bb7108 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
@@ -33,10 +33,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     openstack:
       - newton:

diff --git a/jjb/netvirt/netvirt-legacy-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml
index c1edd3842de9929cf28f35c138c5203d87e274b0..3e94b1f831835761a704c006a13e48184626de02 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit.yaml
@@ -17,10 +17,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index e2a79df84bd021e23b47dd5ae738e32ba114bdf3..aea918ec7f7726acf602a1077891eedec3fb3a8c 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -101,40 +101,6 @@
     email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''
 
-- project:
-    name: netvirt-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'netvirt'
-    project-name: 'netvirt'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    dependencies: >
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
-    archive-artifacts: ''
-
 - project:
     name: netvirt-vpp
     jobs:

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
deleted file mode 100644 (file)
index 52282f9..0000000
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- project:
-    name: neutron-daily-openstack
-    jobs:
-      # TODO: Do we want boron job too?
-      - 'neutron-daily-openstack-beryllium'
-
-    project: 'neutron'
-
-- job-template:
-    name: 'neutron-daily-openstack-beryllium'
-
-    project-type: freestyle
-    node: centos7-devstack-2c-4g
-    description: 'Jenkins job to run Tempest tests for the ODL ML2 MechanismDriver on Neutron dummy provider. '
-    concurrent: true
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '198'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '90'
-      - ssh-agent-credentials:
-          users:
-            - 'openstack-gerrit-ssh'
-
-    triggers:
-      - timed: '@daily'
-
-    builders:
-      - inject:
-          properties-content: |
-            # FIXME: Should *-beryllium job set lithium version? Add a comment why.
-            ODL_VERSION=lithium-latest
-            TEMPEST_REGEX=tempest.api.network
-            KARAFFEATURE=odl-neutron-dummyprovider-test
-      - shell: !include-raw-escape: include-raw-openstack-ci.sh
-
-    publishers:
-      - archive:
-          artifacts: 'logs/**'
-          fingerprint: false
-      - email-ext:
-          subject: '[neutron] $DEFAULT_SUBJECT'
-          attach-build-log: false
-          failure: false
-          unstable: false
-          fixed: false

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 4f44276fe95d323933628be23f36b4d6db825fa6..e1547594ac78966fc38b9e0caf724ff70a563d3c 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -85,34 +85,6 @@
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: neutron-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - 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/next/next.yaml b/jjb/next/next.yaml
index b34994c21dc9a0f9a14a4014bacc45fcada430ed..cc7883d3e8a8f2fb0ae1342c067e8b6185773dda 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[next]'
     archive-artifacts: ''
 
-- project:
-    name: next-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'next'
-    project-name: 'next'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-    archive-artifacts: ''
-
 - project:
     name: next-sonar
     jobs:

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 3f92dc6c45305260c84a91ef9a2d9939e36341fe..fffb923a4469a37bc135a7afd366683650b8f58c 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 61ef22ebf0c857b31131abf2891e72c031697b65..be113283a07252ccce9430f5321a0c8b96bffdc4 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 3ec53dc2e9ff8244f788f67bfa9f5be2116571ee..1ed184d545a2939f90dc341d6ecdd94a7993ffd4 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
-- project:
-    name: nic-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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 7076499bd90d133452dfc71bcf7d313acef69b44..672dd969c36bdd579b3cc302c3d86720ab2073cd 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -85,35 +85,6 @@
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: odlparent-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml
index b8222a6a0c60f6c83c53d53d27276324c0562920..32d435eda5236cb241336dfd5cd72c164f46be2c 100644 (file)
--- a/jjb/of-config/of-config-csit-basic.yaml
+++ b/jjb/of-config/of-config-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index d78a9bef35fa936baf09c8b7a700c496a97917e6..004bc17ec2a60b86b2d2b2ed2d9c85454b00df24 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
-- project:
-    name: of-config-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: netconf-merge-{stream}'
-    email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
-
 - project:
     name: of-config-sonar
     jobs:

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index ca6bcac41c9b1f0ee584792740ef2ae8eb623d2d..8775028260cf4ab89a39e49cceaa148b658929e1 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -74,32 +74,6 @@
     email-upstream: '[circuitsw]'
     archive-artifacts: ''
 
-- project:
-    name: circuitsw-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[circuitsw]'
-    archive-artifacts: ''
-
 - project:
     name: circuitsw-sonar
     jobs:

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 9485b8bb10691a28ff4bd9f83cfd969f9832657b..311d587a8baea863a74af20727af0ce129364790 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
-- project:
-    name: openflowjava-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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-bulkomatic-clustering-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
deleted file mode 100644 (file)
index f4278fb..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-bulkomatic-clustering-daily-old
-    jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-clustering-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
deleted file mode 100644 (file)
index 95e6917..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-bulkomatic-clustering-perf-daily-old
-    jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-clustering-perf-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: '8 GB General Purpose v1'
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count_per_switch:2000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Java Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Java Performance'
-    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
deleted file mode 100644 (file)
index baf8cf0..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-bulkomatic-perf-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-perf-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: 8 GB General Purpose v1
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count_per_switch:2000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Java Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Java Performance'
-    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
deleted file mode 100644 (file)
index 9c01b85..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-cbench-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
-
-    # Robot custom options
-    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
deleted file mode 100644 (file)
index d2aca6b..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-clustering-old
-    jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'clustering'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
deleted file mode 100644 (file)
index 1b29b0b..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-flow-services-old
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'flow-services'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
-
-    # Robot custom options
-    robot-options: ''
-
-    # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
deleted file mode 100644 (file)
index ac1a48a..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-link-scalability-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'link-scalability-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: ''
-
-    # Plot Info
-    01-plot-title: 'Maxmum Links Full Mesh Topology'
-    01-plot-yaxis: 'Links'
-    01-plot-group: 'Link Scalability'
-    01-plot-data-file: 'links.csv'
-    02-plot-title: 'Topology Discover Time'
-    02-plot-yaxis: 'Seconds'
-    02-plot-group: 'Link Scalability'
-    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
deleted file mode 100644 (file)
index 70049cd..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-longevity-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-    build-timeout: 1440
-
-    # The functionality under test
-    functionality: 'longevity'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TEST_LENGTH:23h'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
deleted file mode 100644 (file)
index 4345cf5..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-restconf-clustering-perf-daily-old
-    jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'restconf-clustering-perf-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: 8 GB General Purpose v1
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count:64000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'REST Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'REST Performance'
-    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
deleted file mode 100644 (file)
index 2a5daf2..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-restconf-perf-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'restconf-perf-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: '8 GB General Purpose v1'
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count:64000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'REST Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'REST Performance'
-    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
deleted file mode 100644 (file)
index 8d77c05..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-scalability-old
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
deleted file mode 100644 (file)
index ffc19f4..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-scale-stats-collection-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scale-stats-collection-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: '8 GB General Purpose v1'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
-
-    # Robot custom options
-    robot-options: '-v flnr:64000 -v swnr:32 -v fpr:200'
-
-    # Plot Info
-    01-plot-title: 'Stats Collection Rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Stats Collection Performance'
-    01-plot-data-file: 'stats_rate.csv'
-    02-plot-title: 'Stats Collection Time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Stats Collection Performance'
-    02-plot-data-file: 'stats_time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
deleted file mode 100644 (file)
index 72e2889..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-scalability-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'sw-scalability-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Plot Info
-    01-plot-title: 'Maximum Switches Linear Topology'
-    01-plot-yaxis: 'Switches'
-    01-plot-group: 'Switch Scalability'
-    01-plot-data-file: 'switches.csv'
-    02-plot-title: 'Topology Discover Time'
-    02-plot-yaxis: 'Seconds'
-    02-plot-group: 'Switch Scalability'
-    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 084bb62740843cbed2162f98a96507696531d8af..7964c15988e78d628e3276b324a5c46432c05f4e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -95,39 +95,6 @@
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
 
-- project:
-    name: openflowplugin-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index a952b8a7bf9ec84d4fcf8933bcc92ec63c148bc0..0c8ffa2339f0b59367ba3a91a912deb3eae6695f 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -15,9 +15,6 @@
       - boron:
           branch: 'stable/boron'
           jdk: openjdk8
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index a962234065f7c1b663e08528f0dbdacbd509ddb8..1b49ffd13db1ee68797255b4f2ded047aa993c4d 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -31,14 +31,6 @@
           rapidjson-scm: v1
           openvswitch-build: v1
           openvswitch-scm: v1
-      - beryllium:
-          branch: 'stable/beryllium'
-          libuv-build: v1
-          libuv-scm: v1
-          rapidjson-build: v1
-          rapidjson-scm: v1
-          openvswitch-build: v1
-          openvswitch-scm: v1
 
     project: 'opflex'
 

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 974c83fd05e776f753e5a22d1b9537264bccb45e..a101c014c0760671c7802d802e8a4e57860b0906 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -25,10 +25,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index a55e9f8d067e53d912ce545ae3747eeccf8d7697..48ff9f27e52f70e2cd9633044c0fcb70d2020410 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -25,10 +25,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 87fee427ed361f89e18d70e13a404d6937df21f1..037c9d58e2cb0683f459faeaff6a4fa8863e327e 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -20,12 +20,6 @@
           jdks:
             - openjdk8
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-          karaf-version: karaf3
 
     project: 'ovsdb'
     archive-artifacts: '*.log'

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index bc243cd2fc4cf4967408c9d3ee3cc608cee19fbc..7686aaad5849d7be6fb56d43885822100f0b7986 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -82,32 +82,3 @@
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
-
-- project:
-    name: ovsdb-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index e6941bf99e022a22585c6fd0210cd439fe4b2360..488e148568f3357852b9117db2a5b8e8cc777aea 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 4157f74d39e507b2e184aa36ebd24954d9a42a86..60ecd6791f694df653ead1a45289c95c65eb8619 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
-- project:
-    name: packetcable-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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 c84352ed9ec79406870c48a7727e68187f845d07..06ba70a8a7ab486253ff9c9dcc55e602d1f36d4c 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -79,33 +79,6 @@
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
-- project:
-    name: persistence-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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 37e2e66a0b7a9abd9faa9acf180c6e53c5f0efed..a846568d8cd92124ec9bdf406a80488733cdc0aa 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -76,33 +76,6 @@
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
-- project:
-    name: reservation-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index 8b31738bfa50ae14eace5fb8a55895d7249b384c..2afb1f5a93d0b1e34d0fab957480320d43a21fea 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 73ef1eed08880ce53485f1793fa0cb74eea0a092..b480fd3ddae56ed2b2410bb4acf6702a974ba52c 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
-- project:
-    name: sdninterfaceapp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index f6c8678c39ceadbea75bdd6bdcc299d2f8c9bb41..2575427cba9e081a59428f69f9c8dbbcc22a3e37 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index ee2489e762cba06f221de852e310e298bb459f88..2b9310d92f276be39012670c13fc09e96ade224e 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -14,8 +14,6 @@
           branch: 'stable/carbon'
       - boron:
           branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
 
     project: 'sfc'
 

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 2c32dfe76eb87b053abf885cd601ec3e3eb954f7..7751399f5a67e1a057ebe18c8e712e06f329e250 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
 
-- project:
-    name: sfc-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-
 - project:
     name: sfc-sonar
     jobs:

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 13ca70d9c37d06c160ea06d98e807923b8beb37e..9b6ae3888130c6802c6125f6f5595f055c2497cc 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -83,36 +83,6 @@
     email-upstream: '[snbi]'
     archive-artifacts: ''
 
-
-- project:
-    name: snbi-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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 720213d7ba6d707b6450ba061a0499508c311168..cf6c2e9a41c66675dab13741c1dbacaa93c35f4f 100644 (file)
--- a/jjb/snmp/snmp-csit-basic.yaml
+++ b/jjb/snmp/snmp-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 44ddc07f249e9a1fe3387f448a172daa473d7987..20c3548c0fa7f901a935b3e40c013af8db4818c7 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[snmp] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: snmp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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 3cf225219fcbc433a5351b8dd3ab13a74653fa72..51d3e480fe54a08806633867b671a5f9617b102f 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -84,35 +84,6 @@
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: snmp4sdn-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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 8429fcdffe91a2309e9c49010d8dd7c1f039b9b9..b674e0651299db13eacdbe7dc6c0872a7c7ba228 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 4d58157cf5033378dfcc2fb35c89061491707522..ece9b88b2d872c0427051031aabe92a4be384310 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 25edbef3abdb8c3182126de46c2a364ce3985d54..6448938d6fe38f8330657d6950d036722bb2c0ac 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -23,10 +23,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 32152e1dddd66d203171512ac2f04895eb3e2686..c32a417d74576e9eda6867edca0f9022c4c9ec08 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: sxp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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 cd2bb78d2874ff5a9da3d2e3d1a17d1fd250d5c3..d35bdb2a5f803973a6ad48da7b6d1dc3a8209de4 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -79,35 +79,6 @@
     email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
-- project:
-    name: tcpmd5-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'tcpmd5'
-    project-name: 'tcpmd5'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index d8a8881f225a32a6f7f7e832dafe8ee890de9ce2..0485111cad0deee85c45f23020b468580b376e61 100644 (file)
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 7ac5137e08155d3120ff422687d27c37396a14f5..74eb0fa4eec01c2573f996fb4e9222543aaae49d 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -83,36 +83,6 @@
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-
-- project:
-    name: topoprocessing-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    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-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 99c9dc322bd215b5fa373757e9b549709947cafa..ec117395302dca6be5636401cfbacc05540ff07f 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index bb99a172a347b3b899464a847a8c432511edfa24..325c3420c966c569783219f947007a7dd6db8468 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 401c1e09f9758738bd272c4c3af12a8d6eac956e..7300d3a0d3383cbd2a801ce8dbffc9be06590cfb 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index b8e5cd3c8a02cd96112f609407742494a3524a80..494321e7d2b2f3d718427b2d00f28acf0f1d6a63 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
-- project:
-    name: tsdr-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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 5a9d13f93138e3d7357f9a7303b1ad7a2aa93c79..10cffde65194888610b3d2d9260931e6a5f04d7c 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: ttp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 8a5067f273b16018e28fc87746a90a097289ff48..e80aee0b93b11c3faf988f289b7a267e9db8b95c 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index bf9b84e9b8f6364ceff96e5fbf45ca822329e9c9..df1d87f5cd94987eeea48fa707543ea2f22e7171 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -83,36 +83,6 @@
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
 
-
-- project:
-    name: unimgr-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-        - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
-
 - project:
     name: unimgr-sonar
     jobs:

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 402b071b47bfe7f2bd8f943fdf866c763121b506..8679bab957923e5acb9bb253d6e0df100c7a9ce4 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 675c3b6d051cf8af01f29fbd2f414e6b593ae328..fab1687273627e2c331aea319ca519c64032795d 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/usc/usc-csit-udp.yaml b/jjb/usc/usc-csit-udp.yaml
index b827b37005ee47937d216a5fdb88d740973351ac..b6af34d0330b40804174cf89c44efe8d587c31c9 100644 (file)
--- a/jjb/usc/usc-csit-udp.yaml
+++ b/jjb/usc/usc-csit-udp.yaml
@@ -17,10 +17,6 @@
           branch: 'master'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 7798961f115a961b266d3940248182d39c395166..8e6fc58f9f3e3aea9b8279b8e4217944504f24f5 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: usc-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index c13bbf62c330c9fd3d0fe2b71adf77c16104f790..3fbd3ebac12ed656e81d5110bdc3674339306b72 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -24,10 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 67ce4ac85131fb448d1b6f90f6424bb0c795a0d0..a2717f3d3fc82864a842963c6e99aa81b512dc06 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[usecplugin] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: usecplugin-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-        - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-    archive-artifacts: ''
-
 - project:
     name: usecplugin-sonar
     jobs:

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
deleted file mode 100644 (file)
index debef1f..0000000
--- a/jjb/vpnservice/vpnservice.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: vpnservice-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'vpnservice'
-    project-name: 'vpnservice'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-        - openjdk8
-    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: ''

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index f1ba019d082c87bf2ccf8caa09a8e491ccfaf015..20d86d4774dad17a663e260cde51e40b8d733d90 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -26,10 +26,6 @@
           jre: 'openjdk8'
           karaf-version: karaf3
           tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index b2b0482889cfe11d4edd90febe26d630b175170d..4cb61a3bd135f1434bac5ca34dec43df18ac0f80 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -24,11 +24,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439
 
     install:
       - only:

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index e6fdab106d97dab09fc4d30c1b4fe2bf49666d71..51722ff563e021d39dac094eb5eee4135ba30e64 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -31,10 +31,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     openstack:
       - newton:

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index bf46dcc81f852b1cfeb4a0a48c1bd520914cb887..e3ba2c6c01493ad1224870974c3c9c1010ef55f6 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -95,39 +95,6 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
-- project:
-    name: vtn-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index d839cb7b9275b863e2e6c1f0aa2d648fa7842dc7..f21211bdc0df0bd0ce4880261d47f5967a5ac746 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -83,35 +83,6 @@
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
-- project:
-    name: yang-push-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[yang-push]'
-    archive-artifacts: ''
-
 - project:
     name: yang-push-sonar
     jobs:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 4aeeea1478272594db0a067bb1178f70e02842d5..e14bce5bf49337aee674f47813bc8b08428f4d81 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -85,37 +85,6 @@
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: yangtools-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn32:
-          mvn-version: 'mvn32'
-      - mvn33:
-          mvn-version: 'mvn33'
-    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: