Remove lithium stream since netvirt was added later

Change-Id: Icb0856fddfec5fb8d5342b962906e8883fe8e100
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
index 950a441b651cc67138e5fa30fe223d148eb5c4ce..1c7d2777dd4aaaba9f2e8cb676f3551729d47e50 100644 (file)
--- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
@@ -16,9 +16,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     openstack:
         - mitaka:

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index 994d4c1a07ff2c5b8a9e3754ad7981facc676df5..54d4793e3981930f90b98c9f71c22f98828702fb 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -16,9 +16,6 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     openstack:
         - mitaka:

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 75986c37da21d87606ce6666b9900ea6f09362e7..7a7fabda252c74d93f31bb28f1366470ce140b01 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -16,11 +16,6 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'netvirt'
 

diff --git a/jjb/netvirt/netvirt.cfg b/jjb/netvirt/netvirt.cfg
index 744ffd73cbb46813ce5f29685f5cecad931e4ef0..8fdf3adc14cbb5080322aea3146b42ebc1b3c5bb 100644 (file)
--- a/jjb/netvirt/netvirt.cfg
+++ b/jjb/netvirt/netvirt.cfg
@@ -7,9 +7,5 @@ STREAMS:
     branch: stable/beryllium
     jdks: openjdk7,openjdk8
     autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
 DEPENDENCIES: controller,neutron,odlparent,openflowjava,openflowplugin,ovsdb,sfc,yangtools
 JOB_TEMPLATES: verify,merge,periodic,distribution,distribution-check,integration

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 5a9eb8aa6b9aaec9551553efc1db1c65d177cdbc..a422a581c306c177cd8734c27ce48071157b6eb1 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -34,13 +34,6 @@
                 - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-            disable_autorelease: True
-            disable_distribution_check: True
 
     project: 'netvirt'