Merge "Make autorelease & unimgr use java-builder-4c-16g"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 5d5db3ceaf7d9bedd15e6b38ccd5c4aa0e12967b..f528fbbebee2a491a20bddcdcd8cf1a30f930516 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -8,5 +8,6 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - CentOS 7 - java-builder - 20171209-0032
 * ZZCI - CentOS 7 - robot - 20171207-1911
 * ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
+* ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
new file mode 100644 (file)
index 0000000..a627263
--- /dev/null
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -0,0 +1,31 @@
+---
+- project:
+    name: daexim-csit-clustering-basic
+    jobs:
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'daexim'
+
+    # The functionality under test
+    functionality: 'clustering-basic'
+
+    # Project branches
+    stream:
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+
+    install:
+      - only:
+          scope: 'only'
+
+    # no mininet required
+    tools_system_count: 0
+
+    # Features to install
+    install-features: 'odl-daexim-all,odl-netconf-topology,odl-jolokia'
+
+    # Robot custom options
+    robot-options: ''

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 4c2745dc5e3cb730cb99048f8f0945eff87cc90c..70a637e85c6c9d7f83b599136697bdfb127f954a 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -26,7 +26,7 @@
 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
+    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 97f960b78a3d2f6aba2601140aac069853d28c25..891ff9a3ab731244c4af5dac1dd18e50ef4054aa 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -27,7 +27,7 @@
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
+    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
 
     # Features to install
     install-features: >

diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh
index 41e99411e90253ba107a77e5960cd1ea8c7c7ddf..27a9d2447c103762d2e640d1e942378f0d665ffb 100644 (file)
--- a/jjb/integration/integration-configure-clustering.sh
+++ b/jjb/integration/integration-configure-clustering.sh
@@ -66,8 +66,6 @@ fi
 
 # Create the configuration script to be run on controllers.
 cat > ${WORKSPACE}/configuration-script.sh <<EOF
-echo "Create RAM disk"
-sudo mount -t tmpfs -o size=2G tmpfs /tmp
 
 echo "Changing to /tmp"
 cd /tmp

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index f0c2841a896043c81e0bdc7eeec28575dc83fbf5..b8bbd135b298d3c27adebd89aecf95c0826bfeb7 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -45,8 +45,6 @@ if [ -f "${WORKSPACE}/test/csit/scriptplans/${TESTPLAN}" ]; then
 fi
 
 cat > ${WORKSPACE}/configuration-script.sh <<EOF
-echo "Create RAM disk"
-sudo mount -t tmpfs -o size=2G tmpfs /tmp
 
 echo "Changing to /tmp"
 cd /tmp

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 3d95758b5e8bb87d28e63fbd156215fd4384f579..3ece1e1fcb6edc5c2cc462d5f7b742ab5207e1a9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -24,11 +24,15 @@
       - only:
           scope: 'only'
 
+    # Job images
+    odl_system_flavor: v1-performance-4
+    tools_system_flavor: v1-performance-2
+
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
+    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Plot Info
     01-plot-title: 'Throughput Mode'