Merge "Revert "Create RAM disk on ODL VM /tmp folder""

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/autorelease/autorelease-maven-deploy.sh b/jjb/autorelease/autorelease-maven-deploy.sh
index 8d24150c9a1da5f08e30180b130e652efc47a14e..a55cf6d5ae779186882149d9b1e067f6a469d345 100644 (file)
--- a/jjb/autorelease/autorelease-maven-deploy.sh
+++ b/jjb/autorelease/autorelease-maven-deploy.sh
@@ -20,7 +20,7 @@ mkdir -p m2repo/org/opendaylight/
 # in cases where an internal ci system is using multiple NEXUS systems one for artifacts and another for staging,
 # we can override using ODLNEXUS_STAGING_URL to route the staging build to the 2nd server.
 # (most CI setups where a single Nexus server is used, ODLNEXUS_STAGING_URL should be left unset)
-NEXUS_STAGING_URL=${ODLNEXUS_STAGING_URL:-"http://10.29.8.46:8081"}
+NEXUS_STAGING_URL=${ODLNEXUS_STAGING_URL:-"http://10.30.168.7:8081"}
 NEXUS_STAGING_PROFILE=${ODLNEXUS_STAGING_PROFILE:-425e43800fea70}
 NEXUS_STAGING_SERVER_ID=${ODLNEXUS_STAGING_SERVER_ID:-"opendaylight.staging"}
 

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/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
new file mode 100644 (file)
index 0000000..2a819d4
--- /dev/null
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -0,0 +1,30 @@
+---
+- project:
+    name: infrautils-patch-test
+    jobs:
+      - '{project}-patch-test-{feature}-{stream}'
+
+    project: 'infrautils'
+
+    stream:
+      - oxygen:
+          branch: 'master'
+          os-branch: 'ocata'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          os-branch: 'ocata'
+      - carbon:
+          branch: 'stable/carbon'
+          os-branch: 'ocata'
+          karaf-version: karaf3
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 125ea2fc8b04078bc37044a116d3b88992b8b03b..58e17ec98b8ec4923e1a4acfd6b38d50604638b7 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -468,6 +468,10 @@ env
 source /opt/stack/devstack/openrc admin admin
 echo -e "\nenv after openrc\n"
 env
+echo "\nsudo du -hs /opt/stack"
+sudo du -hs /opt/stack
+echo "\nsudo mount"
+sudo mount
 EOF
 
     # Since this log collection work is happening before the archive build macro which also
@@ -793,6 +797,8 @@ echo "127.0.0.1   localhost \${HOSTNAME}" >> /tmp/hosts
 echo "::1         localhost \${HOSTNAME}" >> /tmp/hosts
 sudo mv /tmp/hosts /etc/hosts
 sudo mkdir /opt/stack
+echo "Create RAM disk for /opt/stack"
+sudo mount -t tmpfs -o size=2G tmpfs /opt/stack
 sudo chmod 777 /opt/stack
 cd /opt/stack
 echo "git clone https://git.openstack.org/openstack-dev/devstack --branch ${OPENSTACK_BRANCH}"

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 5b37181ea798f1d3c6df0752979f293433b809b4..0f914ffdad19f077464a4ab7f4b4604f548fd1e5 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -989,7 +989,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
     concurrent: true
 
     properties:
@@ -1186,7 +1186,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-1c-4g
+    node: centos7-robot-2c-8g
     concurrent: true
 
     properties:

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'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 27ffed7ed90a07ce1cb089b7cb790980e88548a9..0852dc9ed13df4cdff28e03853911bedf927e531 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -26,8 +26,15 @@
       - only:
           scope: 'only'
 
+    # Job images
+    odl_system_flavor: v1-performance-4
+
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-rest,decanter-collector-jmx,decanter-appender-elasticsearch'
+    install-features: >
+        odl-openflowplugin-flow-services-rest,
+        odl-openflowplugin-app-table-miss-enforcer,
+        decanter-collector-jmx,
+        decanter-appender-elasticsearch
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index 4958f49f3a39ca32cfeacabfd4770e31d04525ff..ae1f2b693faa44d7b633d0a78805c55e7907d2e2 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -28,10 +28,12 @@
       - netvirt:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
       - l2gw:
           csit-list: >
               netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
-
       - core:
           csit-list: >
               ovsdb-csit-1node-gate-southbound-all-{stream},

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index fd43f409d82778c1e121a2210d62bf2b24482504..81b102cb7100d69f242864eb601a3d2359578561 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -62,11 +62,11 @@ resources:
             key_name: {get_param: ssh_key}
             user_data: |
                 #!/bin/bash
-                until host git.opendaylight.org &>/dev/null
+                until host devvexx.opendaylight.org &>/dev/null
                 do
-                    echo "Waiting until git.opendaylight.org is resolvable..."
+                    echo "Waiting until devvexx.opendaylight.org is resolvable..."
                 done
-                git clone https://git.opendaylight.org/gerrit/releng/builder /builder
+                git clone git://devvexx.opendaylight.org/mirror/releng/builder /builder
                 /builder/jenkins-scripts/jenkins-init-script.sh
 
 outputs: