Merge "Add 3node verify for genius csit"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 58beb477bc3152d1d4de9086360337acdb7c4755..75631bed7706ca3ed7e36e2efb06974759f18977 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -40,4 +40,5 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 LTS Trusty Tahr (cloudimg)
 * Ubuntu 16.04 - gbp - 20170308-0321
 * Ubuntu 16.04 - mininet-ovs-25 - 20170308-0230
+* Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740
 * Ubuntu 16.04 LTS (2016-05-03 cloudimg)

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 427fd1ba77e62f4303813b2f71627c26905f4809..e475941b8294279aba3d5ab57eac48a67917a509 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -21,6 +21,10 @@
           jre: 'openjdk8'
           karaf-version: karaf3
 
+    # dluxapps started in Carbon project, so current verify with Boron is not working
+    verify-stream: 'carbon'
+    verify-branch: 'stable/carbon'
+
     install:
       - only:
           scope: 'only'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 5057903097085ab3a862823774ec0d9a0fc654c4..f34fe3cad702af674a09f0ab27e733a774454248 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -253,7 +253,7 @@
         groupbasedpolicy-csit-1node-3-node-only-nitrogen,
         groupbasedpolicy-csit-1node-6node-all-nitrogen,
         groupbasedpolicy-csit-1node-6node-only-nitrogen,
-        groupbasedpolicy-csit-1node-openstack-liberty-openstack-nitrogen,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-nitrogen,
         groupbasedpolicy-csit-1node-sxp-only-nitrogen,
         groupbasedpolicy-csit-3node-clustering-all-nitrogen,
         groupbasedpolicy-csit-3node-clustering-only-nitrogen,
@@ -456,7 +456,7 @@
         groupbasedpolicy-csit-1node-3-node-only-carbon,
         groupbasedpolicy-csit-1node-6node-all-carbon,
         groupbasedpolicy-csit-1node-6node-only-carbon,
-        groupbasedpolicy-csit-1node-openstack-liberty-openstack-carbon,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-carbon,
         groupbasedpolicy-csit-1node-sxp-only-carbon,
         groupbasedpolicy-csit-3node-clustering-all-carbon,
         groupbasedpolicy-csit-3node-clustering-only-carbon,
@@ -651,7 +651,7 @@
         groupbasedpolicy-csit-1node-3-node-only-boron,
         groupbasedpolicy-csit-1node-6node-all-boron,
         groupbasedpolicy-csit-1node-6node-only-boron,
-        groupbasedpolicy-csit-1node-openstack-liberty-openstack-boron,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-boron,
         groupbasedpolicy-csit-3node-clustering-all-boron,
         groupbasedpolicy-csit-3node-clustering-only-boron,
         l2switch-csit-1node-periodic-host-scalability-daily-only-boron,
@@ -837,7 +837,7 @@
         groupbasedpolicy-csit-1node-3-node-only-beryllium,
         groupbasedpolicy-csit-1node-6node-all-beryllium,
         groupbasedpolicy-csit-1node-6node-only-beryllium,
-        groupbasedpolicy-csit-1node-openstack-liberty-openstack-beryllium,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-beryllium,
         groupbasedpolicy-csit-3node-clustering-all-beryllium,
         groupbasedpolicy-csit-3node-clustering-only-beryllium,
         l2switch-csit-1node-periodic-host-scalability-daily-only-beryllium,